diff options
| author | Alexander Kurtakov <akurtako@redhat.com> | 2012-08-28 18:58:43 +0300 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-08-28 13:37:39 -0400 |
| commit | 9298b2b5e4c70841e967d5ebec2fff49d69edcf8 (patch) | |
| tree | 3d307b619b71d38ed0026c0b52f5d47d627cd2ed | |
| parent | f16b4cd1be1513696a47d5e4a812e1123cca35d9 (diff) | |
| download | eclipse.platform.swt-9298b2b5e4c70841e967d5ebec2fff49d69edcf8.tar.gz eclipse.platform.swt-9298b2b5e4c70841e967d5ebec2fff49d69edcf8.tar.xz eclipse.platform.swt-9298b2b5e4c70841e967d5ebec2fff49d69edcf8.zip | |
Make GTK_VERSION a variable.
Allowing to try compiling against different GTK versions is really
helpful while porting to newer version. As the default is set to 2.0
nothing should break unless someone manually passes 3.0 or even 4.0 so
if someone sees a breakage it will be obvious.
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak index 2e407471f5..2616a84548 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak @@ -14,6 +14,7 @@ include make_common.mak SWT_VERSION=$(maj_ver)$(min_ver) +GTK_VERSION?=2.0 # Define the various shared libraries to be build. WS_PREFIX = gtk @@ -47,16 +48,16 @@ CAIROCFLAGS = `pkg-config --cflags cairo` CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) -GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-x11-2.0 -lgthread-2.0 -lXtst +GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION)` +GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-x11-$(GTK_VERSION) -lgthread-2.0 -lXtst CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc AWT_LFLAGS = -shared ${SWT_LFLAGS} AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0` -ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0 +ATKCFLAGS = `pkg-config --cflags atk gtk+-$(GTK_VERSION)` +ATKLIBS = `pkg-config --libs-only-L atk gtk+-$(GTK_VERSION)` -latk-1.0 -lgtk-x11-$(GTK_VERSION) GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 |