Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2007-10-25 17:22:53 +0000
committerAndrew Niefer2007-10-25 17:22:53 +0000
commit7de5d9c5d630c42d7cb93cd2ec608da216665716 (patch)
tree51baa6d5e4f6642487ccc44177b4ec695e82ec05 /bundles/org.eclipse.equinox.executable/library/motif
parent74ce77d83dcbddcdb4242160f980406c606826cf (diff)
downloadrt.equinox.framework-7de5d9c5d630c42d7cb93cd2ec608da216665716.tar.gz
rt.equinox.framework-7de5d9c5d630c42d7cb93cd2ec608da216665716.tar.xz
rt.equinox.framework-7de5d9c5d630c42d7cb93cd2ec608da216665716.zip
bug 207087 - motif.hpux.ia64_32
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library/motif')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/build.sh9
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak17
2 files changed, 18 insertions, 8 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/build.sh b/bundles/org.eclipse.equinox.executable/library/motif/build.sh
index 0ad3d2bb3..4bbe99680 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/build.sh
+++ b/bundles/org.eclipse.equinox.executable/library/motif/build.sh
@@ -36,6 +36,7 @@ programOutput="eclipse"
defaultOS=""
defaultOSArch=""
defaultWS="motif"
+defaultJava=DEFAULT_JAVA_JNI
makefile=""
javaHome=""
if [ "$OS" = "" ]; then
@@ -64,7 +65,8 @@ case $OS in
OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
"SunOS")
- PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH
+# PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH
+ PATH=/usr/ccs/bin:/export/home/SUNWspro/bin:$PATH
export PATH
makefile="make_solaris.mak"
defaultOS="solaris"
@@ -85,6 +87,8 @@ case $OS in
defaultOSArch="ia64_32"
defaultWS="motif"
OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+ javaHome="/opt/java1.5"
+ defaultJava=DEFAULT_JAVA_EXEC
;;
*)
makefile="make_hpux_PA_RISC.mak"
@@ -130,8 +134,9 @@ DEFAULT_OS="$defaultOS"
DEFAULT_OS_ARCH="$defaultOSArch"
DEFAULT_WS="$defaultWS"
JAVA_HOME=$javaHome
+DEFAULT_JAVA=$defaultJava
-export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS X11_HOME MOTIF_HOME JAVA_HOME
+export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS X11_HOME MOTIF_HOME JAVA_HOME DEFAULT_JAVA
# If the OS is supported (a makefile exists)
if [ "$makefile" != "" ]; then
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak b/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak
index 3125a3095..7bd874e88 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak
+++ b/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak
@@ -26,9 +26,11 @@ include ../make_version.mak
# PROGRAM_OUTPUT=eclipse
#endif
+DEFAULT_JAVA=DEFAULT_JAVA_EXEC
PROGRAM_LIBRARY=eclipse_$(LIB_VERSION).so
# Define the object modules to be compiled and flags.
+CC=gcc
MAIN_OBJS = eclipseMain.o
COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseMotifCommon.o eclipseMotifInit.o
DLL_OBJS = eclipse.o eclipseMotif.o eclipseUtil.o eclipseJNI.o eclipseNix.o eclipseShm.o \
@@ -36,23 +38,26 @@ DLL_OBJS = eclipse.o eclipseMotif.o eclipseUtil.o eclipseJNI.o eclipseNix.o ecli
EXEC = $(PROGRAM_OUTPUT)
DLL = $(PROGRAM_LIBRARY)
-LIBS = -L$(MOTIF_HOME)/lib -L$(X11_HOME)/lib -lXm -lXt -lX11 -lpthread
-MOTIF_LIBS = -DXM_LIB="\"libXm.so.2\"" -DXT_LIB="\"libXt.so.6\"" -DX11_LIB="\"libX11.so.6\""
-LFLAGS = -shared -Wl,--export-dynamic
+LIBS = -L$(MOTIF_HOME)/lib -L$(X11_HOME)/lib -lpthread
+MOTIF_LIBS = -DXM_LIB="\"libXm.so.1\"" -DXT_LIB="\"libXt.so.1\"" -DX11_LIB="\"libX11.so.1\""
+LFLAGS = -shared
+# -Wl,--export-dynamic
CFLAGS = -O -s \
-DNO_XINERAMA_EXTENSIONS \
-DNETSCAPE_FIX \
-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
-DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \
-DDEFAULT_WS="\"$(DEFAULT_WS)\"" \
+ -D$(DEFAULT_JAVA) \
+ -DHPUX \
$(MOTIF_LIBS) \
- +Z \
-I./ \
-I../ \
-I$(MOTIF_HOME)/include \
- -I$(X11_HOME)/include
+ -I$(X11_HOME)/include \
+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/hp-ux
-all: $(EXEC)
+all: $(EXEC) $(DLL)
.c.o:
$(CC) $(CFLAGS) -c $< -o $@

Back to the top