From 4588ee8ef913e3dfb66abd904af47b74a4840ca9 Mon Sep 17 00:00:00 2001 From: Neil Date: Sun, 29 Dec 2019 10:48:30 +1100 Subject: Use if function to simplify GTK version setting. --- gtk/makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gtk/makefile b/gtk/makefile index 707f05a4d..05827c3ed 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -26,11 +26,7 @@ endif ARFLAGS = rc RANLIB ?= ranlib -ifdef GTK3 -GTKVERSION=gtk+-3.0 -else -GTKVERSION=gtk+-2.0 -endif +GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0) # Environment variable windir always defined on Win32 @@ -66,7 +62,7 @@ BASE_FLAGS += $(if $(DEBUG),-g,-Os) CXX_BASE_FLAGS =--std=gnu++17 $(BASE_FLAGS) -CONFIG_FLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) +CONFIG_FLAGS:=$(shell pkg-config --cflags $(GTK_VERSION)) MARSHALLER=scintilla-marshal.o all: $(COMPLIB) -- cgit v1.2.3