diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-12-29 10:48:30 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-12-29 10:48:30 +1100 |
| commit | 6f7ab15526f1fef558212efc363a2023a5699e7d (patch) | |
| tree | f70d3b92f223bb23ede97b73a321f86702299312 | |
| parent | 3635a086dd32af68044b1d448435d5678e7e6b51 (diff) | |
| download | scintilla-mirror-6f7ab15526f1fef558212efc363a2023a5699e7d.tar.gz | |
Backport: Use if function to simplify GTK version setting.
Backport of changeset 7850:914269287f12.
| -rw-r--r-- | gtk/makefile | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk/makefile b/gtk/makefile index a050d21ce..b5437346e 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 @@ -76,7 +72,7 @@ LUA_OBJS:=lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o linit.o \ endif -CONFIG_FLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) +CONFIG_FLAGS:=$(shell pkg-config --cflags $(GTK_VERSION)) MARSHALLER=scintilla-marshal.o all: $(COMPLIB) |