132500

2 files changed, 32 insertions, 14 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh
index 52f22fb133..a90796ae86 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh
@@ -54,13 +54,19 @@ case $OS in
 				GECKO_SDK=/bluebird/teamswt/swt-builddir/mozilla/1.4/linux_gtk2/mozilla/dist/sdk
 				GECKO_INCLUDES="-include ${GECKO_SDK}/mozilla-config.h -I${GECKO_SDK}/../include/xpcom -I${GECKO_SDK}/../include/nspr -I${GECKO_SDK}/../include/embed_base -I${GECKO_SDK}/../include/embedstring -I${GECKO_SDK}/../include/string -I${GECKO_SDK}/../include/profdirserviceprovider"
 				GECKO_LIBS="${GECKO_SDK}/../lib/libembed_base_s.a ${GECKO_SDK}/../lib/libprofdirserviceprovider_s.a ${GECKO_SDK}/../lib/libembedstring.a ${GECKO_SDK}/../lib/libxpcomglue_s.a -L${GECKO_SDK}/../bin -L${GECKO_SDK}/../lib/ -lxpcom -lnspr4 -lplds4 -lplc4"
-				PROFILE_INCLUDES="-include ${GECKO_SDK}/mozilla-config.h -I${GECKO_SDK}/../include/xpcom -I${GECKO_SDK}/../include/nspr -I${GECKO_SDK}/../include/string -I${GECKO_SDK}/../include/profdirserviceprovider"
+				PROFILE14_INCLUDES="-include ${GECKO_SDK}/mozilla-config.h -I${GECKO_SDK}/../include/xpcom -I${GECKO_SDK}/../include/nspr -I${GECKO_SDK}/../include/string -I${GECKO_SDK}/../include/profdirserviceprovider"
 				PROFILE14_LIBS="${GECKO_SDK}/../lib/libembed_base_s.a ${GECKO_SDK}/../lib/libprofdirserviceprovider_s.a -L${GECKO_SDK}/../lib/ -lxpcom"
- 			fi
+			fi
 			if [ "${GECKO17_SDK}" = "" ]; then
-				GECKO17_SDK=/bluebird/teamswt/swt-builddir/mozilla/1.7/linux_gtk2/mozilla/builddir/dist/sdk
+				GECKO17_SDK=/bluebird/teamswt/swt-builddir/mozilla/1.7/linux_gtk2/mozilla/dist/sdk
+				PROFILE17_INCLUDES="-include ${GECKO17_SDK}/include/mozilla-config.h -I${GECKO17_SDK}/../include/xpcom -I${GECKO17_SDK}/../include/nspr -I${GECKO17_SDK}/../include/string -I${GECKO17_SDK}/../include/profdirserviceprovider"
 				PROFILE17_LIBS="${GECKO17_SDK}/../lib/libembed_base_s.a ${GECKO17_SDK}/../lib/libprofdirserviceprovider_s.a -L${GECKO17_SDK}/../lib/ -lxpcom"
 			fi
+			if [ "${GECKO18_SDK}" = "" ]; then
+				GECKO18_SDK=/bluebird/teamswt/swt-builddir/mozilla/1.8/linux_gtk2/mozilla/dist/sdk
+				PROFILE18_INCLUDES="-include ${GECKO18_SDK}/include/mozilla-config.h -I${GECKO18_SDK}/../include/xpcom -I${GECKO18_SDK}/../include/nspr -I${GECKO18_SDK}/../include/string -I${GECKO18_SDK}/../include/profdirserviceprovider"
+				PROFILE18_LIBS="${GECKO18_SDK}/../lib/libembed_base_s.a ${GECKO18_SDK}/../lib/libprofdirserviceprovider_s.a -L${GECKO18_SDK}/../lib/ -lxpcom"
+			fi
 			OUTPUT_DIR=../../../org.eclipse.swt.motif.linux.x86
 			makefile="make_linux.mak"
 			echo "Building Linux motif x86 version of SWT"
@@ -123,6 +129,6 @@ case $OS in
 		;;
 esac
 
-export JAVA_HOME MOTIF_HOME CDE_HOME GECKO_SDK GECKO17_SDK GECKO_INCLUDES GECKO_LIBS OUTPUT_DIR PROFILE_INCLUDES PROFILE14_LIBS PROFILE17_LIBS
+export JAVA_HOME MOTIF_HOME CDE_HOME GECKO_SDK GECKO17_SDK GECKO18_SDK GECKO_INCLUDES GECKO_LIBS OUTPUT_DIR PROFILE14_INCLUDES PROFILE17_INCLUDES PROFILE18_INCLUDES PROFILE14_LIBS PROFILE17_LIBS PROFILE18_LIBS
 
 make -f $makefile $1 $2 $3 $4
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/make_linux.mak
index 58d441d941..8cd204bfd2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/make_linux.mak
@@ -59,14 +59,17 @@ CAIROCFLAGS = `pkg-config --cflags cairo`
 CAIROLIBS = -shared -fpic -fPIC -s `pkg-config --libs-only-L cairo` -lcairo
 
 MOZILLA_PREFIX = swt-mozilla
-PROFILE14_PREFIX = swt-mozilla14profile$(GCC_VERSION)
-PROFILE17_PREFIX = swt-mozilla17profile$(GCC_VERSION)
+PROFILE14_PREFIX = swt-mozilla14-profile$(GCC_VERSION)
+PROFILE17_PREFIX = swt-mozilla17-profile$(GCC_VERSION)
+PROFILE18_PREFIX = swt-mozilla18-profile$(GCC_VERSION)
 MOZILLA_LIB = lib$(MOZILLA_PREFIX)$(GCC_VERSION)-$(WS_PREFIX)-$(SWT_VERSION).so
 PROFILE14_LIB = lib$(PROFILE14_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 PROFILE17_LIB = lib$(PROFILE17_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
+PROFILE18_LIB = lib$(PROFILE18_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
-PROFILE_OBJECTS = xpcom_profile.o
+PROFILE14_OBJECTS = xpcom14_profile.o
 PROFILE17_OBJECTS = xpcom17_profile.o
+PROFILE18_OBJECTS = xpcom18_profile.o
 MOZILLACFLAGS = -O \
 	-DXPCOM_GLUE=1 \
 	-DMOZILLA_STRICT_API=1 \
@@ -145,7 +148,7 @@ cairo_structs.o: cairo_structs.c cairo_structs.h cairo.h swt.h
 cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h
 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo_stats.c
 
-make_mozilla:$(MOZILLA_LIB) $(PROFILE14_LIB) $(PROFILE17_LIB)
+make_mozilla:$(MOZILLA_LIB) $(PROFILE14_LIB) $(PROFILE17_LIB) $(PROFILE18_LIB)
 
 $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
 	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS}
@@ -159,14 +162,23 @@ xpcom_custom.o: xpcom_custom.cpp
 xpcom_stats.o: xpcom_stats.cpp
 	$(CXX) $(MOZILLACFLAGS) ${GECKO_INCLUDES} -c xpcom_stats.cpp
 
-$(PROFILE14_LIB): $(PROFILE_OBJECTS)
-	$(CXX) -o $(PROFILE14_LIB) $(PROFILE_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS}
+$(PROFILE14_OBJECTS): xpcom_profile.cpp
+	$(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} -c xpcom_profile.cpp	
 
-$(PROFILE17_LIB): $(PROFILE_OBJECTS)
-	$(CXX) -o $(PROFILE17_LIB) $(PROFILE_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS}
+$(PROFILE17_OBJECTS): xpcom_profile.cpp
+	$(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} -c xpcom_profile.cpp	
 
-xpcom_profile.o: xpcom_profile.cpp
-	$(CXX) $(MOZILLACFLAGS) ${PROFILE_INCLUDES} -c xpcom_profile.cpp	
+$(PROFILE18_OBJECTS): xpcom_profile.cpp
+	$(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} -c xpcom_profile.cpp	
+
+$(PROFILE14_LIB): $(PROFILE14_OBJECTS)
+	$(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS}
+
+$(PROFILE17_LIB): $(PROFILE17_OBJECTS)
+	$(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS}
+
+$(PROFILE18_LIB): $(PROFILE18_OBJECTS)
+	$(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS}
 
 make_glx: $(GLX_LIB)