diff options
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh | 8 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/buildSWT.xml | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh index 689616e0c9..440c28aee3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh @@ -455,12 +455,14 @@ if [ ${MODEL} = 'x86' -a ${SWT_OS} = 'linux' ]; then export SWT_LFLAGS SWT_PTR_CFLAGS fi -if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" -a ${MODEL} != "sparc64" -a ${MODEL} != 'ia64' ]; then +if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" -a ${MODEL} != "sparc64" -a ${MODEL} != 'ia64' -a ${GTK_VERSION} != '3.0' ]; then echo "libgnomeui-2.0 found, compiling SWT program support using GNOME" MAKE_GNOME=make_gnome else - echo "libgnome-2.0 and libgnomeui-2.0 not found:" - echo " *** SWT Program support for GNOME will not be compiled." + if [ ${GTK_VERSION} != '3.0' ]; then + echo "libgnome-2.0 and libgnomeui-2.0 not found:" + echo " *** SWT Program support for GNOME will not be compiled." + fi fi if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index 8288c35a37..32551ae9d8 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -938,6 +938,7 @@ <param name="build_targets" value="install"/> <param name="libs" value="*pi3*"/> <param name="exports" value="export GTK_VERSION=3.0;"/> + <param name="gtk_version" value="3.0"/> </antcall> </target> @@ -1001,8 +1002,10 @@ </target> <target name="build_local"> + <property name="gtk_version" value="2.0" /> <exec dir="${build_dir}" executable="sh" failonerror="true"> <arg line="build.sh"/> + <env key="GTK_VERSION" value="${gtk_version}"/> <env key="MODEL" value="${swt.arch}"/> <env key="OUTPUT_DIR" value="${output_dir}"/> <arg line="${targets}"/> |