Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.equinox.executable')
-rw-r--r--bundles/org.eclipse.equinox.executable/feature.xml10
-rw-r--r--bundles/org.eclipse.equinox.executable/library/gtk/make_aix.mak11
-rw-r--r--bundles/org.eclipse.equinox.executable/target.build.properties1
-rw-r--r--bundles/org.eclipse.equinox.executable/target.build.xml9
4 files changed, 30 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.executable/feature.xml b/bundles/org.eclipse.equinox.executable/feature.xml
index 2f6a1a995..20f18177c 100644
--- a/bundles/org.eclipse.equinox.executable/feature.xml
+++ b/bundles/org.eclipse.equinox.executable/feature.xml
@@ -148,6 +148,16 @@
version="0.0.0"
fragment="true"/>
+ <plugin
+ id="org.eclipse.equinox.launcher.gtk.aix.ppc"
+ os="aix"
+ ws="gtk"
+ arch="ppc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
+
<plugin
id="org.eclipse.equinox.launcher.motif.hpux.ia64_32"
os="hpux"
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 05b8acd25..b5163fb9d 100644
--- a/bundles/org.eclipse.equinox.executable/library/gtk/make_aix.mak
+++ b/bundles/org.eclipse.equinox.executable/library/gtk/make_aix.mak
@@ -38,7 +38,16 @@ 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.a(libgtk-x11-2.0.so.0)\"" -DGDK_LIB="\"libgdk-x11-2.0.a(libgdk-x11-2.0.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)\"" -DX11_LIB="\"libX11.a(shr_64.o)\""
+
+X11_LIB_ppc = shr4.o
+X11_LIB_ppc64 = shr_64.so
+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)\"" \
+ -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)
+
LFLAGS = ${M_ARCH} -shared
CFLAGS = ${M_ARCH} -g -s -Wall\
-fpic \
diff --git a/bundles/org.eclipse.equinox.executable/target.build.properties b/bundles/org.eclipse.equinox.executable/target.build.properties
index b3817cd42..91f8b0843 100644
--- a/bundles/org.eclipse.equinox.executable/target.build.properties
+++ b/bundles/org.eclipse.equinox.executable/target.build.properties
@@ -44,6 +44,7 @@ root.macosx.cocoa.x86_64.permissions.755=${launcherName}.app/Contents/MacOS/${la
root.aix.motif.ppc=bin/motif/aix/ppc
root.aix.gtk.ppc64=bin/gtk/aix/ppc64
+root.aix.gtk.ppc=bin/gtk/aix/ppc
root.hpux.motif.PA_RISC=bin/motif/hpux/PA_RISC
root.hpux.motif.ia64_32=bin/motif/hpux/ia64_32
diff --git a/bundles/org.eclipse.equinox.executable/target.build.xml b/bundles/org.eclipse.equinox.executable/target.build.xml
index ed649f2b8..f8a5d5719 100644
--- a/bundles/org.eclipse.equinox.executable/target.build.xml
+++ b/bundles/org.eclipse.equinox.executable/target.build.xml
@@ -162,6 +162,14 @@
</copy>
<chmod perm="755" dir="${feature.base}/aix.gtk.ppc64/${collectingFolder}" includes="launcher" />
</target>
+ <target name="rootFilesaix_gtk_ppc">
+ <mkdir dir="${feature.base}/aix.gtk.ppc/${collectingFolder}"/>
+ <copy todir="${feature.base}/aix.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/gtk/aix/ppc" includes="**" />
+ <fileset dir="${basedir}/gtk_root" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/aix.gtk.ppc/${collectingFolder}" includes="launcher" />
+ </target>
<target name="rootFileslinux_gtk_x86_64">
<mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}"/>
<copy todir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" failonerror="true" overwrite="true">
@@ -278,6 +286,7 @@
<antcall target="rootFilessolaris_motif_sparc"/>
<antcall target="rootFilesaix_motif_ppc"/>
<antcall target="rootFilesaix_gtk_ppc64"/>
+ <antcall target="rootFilesaix_gtk_ppc"/>
<antcall target="rootFileshpux_motif_PA_RISC"/>
<antcall target="rootFileshpux_motif_ia64"/>
<antcall target="rootFileshpux_motif_ia64_32"/>

Back to the top