diff options
| author | Andrew Niefer | 2010-02-02 21:18:37 +0000 |
|---|---|---|
| committer | Andrew Niefer | 2010-02-02 21:18:37 +0000 |
| commit | 2a7697713c45e1f8cb8111cebe8ab2603ed93ccc (patch) | |
| tree | 5d750c4e87c214ac58718d2dce96bd510418ca97 /bundles/org.eclipse.equinox.executable | |
| parent | 320f8431fee2d0843f11764c38d6c7c9acdfa4a2 (diff) | |
| download | rt.equinox.framework-2a7697713c45e1f8cb8111cebe8ab2603ed93ccc.tar.gz rt.equinox.framework-2a7697713c45e1f8cb8111cebe8ab2603ed93ccc.tar.xz rt.equinox.framework-2a7697713c45e1f8cb8111cebe8ab2603ed93ccc.zip | |
bug 300912 - launcher fails on solaris
Diffstat (limited to 'bundles/org.eclipse.equinox.executable')
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/.cproject | 1 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/gtk/make_solaris.mak | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.executable/.cproject b/bundles/org.eclipse.equinox.executable/.cproject index 8057a59c2..5095f92dc 100644 --- a/bundles/org.eclipse.equinox.executable/.cproject +++ b/bundles/org.eclipse.equinox.executable/.cproject @@ -56,6 +56,7 @@ <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/> <storageModule moduleId="org.eclipse.cdt.core.pathentry"> +<pathentry kind="mac" name="JNIEXPORT" path="" value=""/> <pathentry include="/usr/X11R6/include" kind="inc" path="" system="true"/> <pathentry include="/opt/gnome/include/gtk-2.0" kind="inc" path="" system="true"/> <pathentry include="/opt/gnome/include/glib-2.0" kind="inc" path="" system="true"/> 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 39fd23f80..5f0f13797 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,7 @@ 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 -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.6\"" +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\"" LFLAGS = -G CFLAGS = $(OPTFLAG) \ -DSOLARIS \ |