aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2012-11-06 11:46:29 (EST)
committerSilenio Quarti2012-11-06 11:47:18 (EST)
commit108ae10eac07bb64b38326ca84e88aaa4dcf8ca3 (patch)
tree76c45af02074b7146492edd0165d5d231c769e16
parent6157cc3bf335a70f0da28d44ffcc19ef32cbffe3 (diff)
downloadrt.equinox.framework-108ae10eac07bb64b38326ca84e88aaa4dcf8ca3.zip
rt.equinox.framework-108ae10eac07bb64b38326ca84e88aaa4dcf8ca3.tar.gz
rt.equinox.framework-108ae10eac07bb64b38326ca84e88aaa4dcf8ca3.tar.bz2
Bug 393681 - Port to GTK+ 3
-rw-r--r--bundles/org.eclipse.equinox.executable/library/gtk/make_aix.mak2
-rw-r--r--bundles/org.eclipse.equinox.executable/library/gtk/make_hpux.mak5
-rw-r--r--bundles/org.eclipse.equinox.executable/library/gtk/make_linux.mak5
-rw-r--r--bundles/org.eclipse.equinox.executable/library/gtk/make_solaris.mak5
4 files changed, 14 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/make_aix.mak b/bundles/org.eclipse.equinox.executable/library/gtk/make_aix.mak
index d169139..2d3a71d 100644
--- a/bundles/org.eclipse.equinox.executable/library/gtk/make_aix.mak
+++ b/bundles/org.eclipse.equinox.executable/library/gtk/make_aix.mak
@@ -44,6 +44,8 @@ X11_LIB_ppc64 = shr_64.o
X11_LIB = -DX11_LIB="\"libX11.a($(X11_LIB_$(DEFAULT_OS_ARCH)))\""
GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.a(libgtk-x11-2.0.so.0)\"" \
-DGDK_LIB="\"libgdk-x11-2.0.a(libgdk-x11-2.0.so.0)\"" \
+ -DGTK3_LIB="\"libgtk-3.a(libgtk-3.so.0)\"" \
+ -DGDK3_LIB="\"libgdk-3.a(libgdk-3.so.0)\"" \
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.a(libgdk_pixbuf-2.0.so.0)\"" \
-DGOBJ_LIB="\"libgobject-2.0.a(libgobject-2.0.so.0)\"" \
$(X11_LIB)
diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/make_hpux.mak b/bundles/org.eclipse.equinox.executable/library/gtk/make_hpux.mak
index 029f641..7b18155 100644
--- a/bundles/org.eclipse.equinox.executable/library/gtk/make_hpux.mak
+++ b/bundles/org.eclipse.equinox.executable/library/gtk/make_hpux.mak
@@ -38,7 +38,10 @@ DLL_OBJS = eclipse.o eclipseGtk.o eclipseUtil.o eclipseJNI.o eclipseShm.o eclips
EXEC = $(PROGRAM_OUTPUT)
DLL = $(PROGRAM_LIBRARY)
LIBS = -L$(MOTIF_HOME)/lib -L$(X11_HOME)/lib -lpthread -lrt
-GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so\"" -DGDK_LIB="\"libgdk-x11-2.0.so\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so\"" \
+GTK_LIBS = \
+ -DGTK_LIB="\"libgtk-x11-2.0.so\"" -DGDK_LIB="\"libgdk-x11-2.0.so\"" \
+ -DGTK3_LIB="\"libgtk-3.so\"" -DGDK3_LIB="\"libgdk-3.so\""
+ -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so\"" \
-DGOBJ_LIB="\"libgobject-2.0.so\"" -DX11_LIB="\"libX11.so\""
LFLAGS = ${M_ARCH} -shared -static-libgcc
# -Wl,--export-dynamic
diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/make_linux.mak b/bundles/org.eclipse.equinox.executable/library/gtk/make_linux.mak
index dda745b..6abe017 100644
--- a/bundles/org.eclipse.equinox.executable/library/gtk/make_linux.mak
+++ b/bundles/org.eclipse.equinox.executable/library/gtk/make_linux.mak
@@ -43,7 +43,10 @@ EXEC = $(PROGRAM_OUTPUT)
DLL = $(PROGRAM_LIBRARY)
#LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl -lX11
LIBS = -lpthread -ldl
-GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
+GTK_LIBS = \
+ -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" \
+ -DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
+ -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic
CFLAGS = ${M_ARCH} -g -s -Wall\
-fpic \
diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/make_solaris.mak b/bundles/org.eclipse.equinox.executable/library/gtk/make_solaris.mak
index 0fbca23..945becf 100644
--- a/bundles/org.eclipse.equinox.executable/library/gtk/make_solaris.mak
+++ b/bundles/org.eclipse.equinox.executable/library/gtk/make_solaris.mak
@@ -43,7 +43,10 @@ EXEC = $(PROGRAM_OUTPUT)
DLL = $(PROGRAM_LIBRARY)
#LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lglib-2.0 -lthread -ldl -lc
LIBS = -lthread -ldl -lc -lrt
-GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.4\""
+GTK_LIBS = \
+ -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" \
+ -DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
+ -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.4\""
LFLAGS = -G
CFLAGS = $(OPTFLAG) \
-DSOLARIS \