|
Andrew Overholt |
ba91294 |
### Eclipse Workspace Patch 1.0
|
|
Andrew Overholt |
ba91294 |
#P org.eclipse.swt
|
|
Andrew Overholt |
ba91294 |
Index: Eclipse SWT PI/gtk/library/build.sh
|
|
Andrew Overholt |
ba91294 |
===================================================================
|
|
Andrew Overholt |
ba91294 |
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh,v
|
|
Andrew Overholt |
3b5177a |
retrieving revision 1.48
|
|
Andrew Overholt |
3b5177a |
diff -u -r1.48 build.sh
|
|
Andrew Overholt |
3b5177a |
--- Eclipse SWT PI/gtk/library/build.sh 5 Jun 2008 17:31:51 -0000 1.48
|
|
Andrew Overholt |
3b5177a |
+++ Eclipse SWT PI/gtk/library/build.sh 6 Apr 2009 21:11:22 -0000
|
|
Andrew Overholt |
3b5177a |
@@ -96,19 +96,19 @@
|
|
Andrew Overholt |
3b5177a |
MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
|
|
Andrew Overholt |
3b5177a |
export MOZILLA_INCLUDES
|
|
Andrew Overholt |
ba91294 |
export MOZILLA_LIBS
|
|
Andrew Overholt |
3b5177a |
- MAKE_MOZILLA=make_mozilla
|
|
Andrew Overholt |
3b5177a |
+ MAKE_MOZILLA="make_mozilla make_xpcominit"
|
|
Andrew Overholt |
3b5177a |
elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then
|
|
Andrew Overholt |
3b5177a |
MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom`
|
|
Andrew Overholt |
3b5177a |
MOZILLA_LIBS=`pkg-config --libs firefox-xpcom`
|
|
Andrew Overholt |
3b5177a |
export MOZILLA_INCLUDES
|
|
Andrew Overholt |
3b5177a |
export MOZILLA_LIBS
|
|
Andrew Overholt |
3b5177a |
- MAKE_MOZILLA=make_mozilla
|
|
Andrew Overholt |
3b5177a |
+ MAKE_MOZILLA="make_mozilla make_xpcominit"
|
|
Andrew Overholt |
ba91294 |
elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
|
|
Andrew Overholt |
ba91294 |
- MOZILLA_INCLUDES=`pkg-config --cflags libxul`
|
|
Andrew Overholt |
ba91294 |
- MOZILLA_LIBS=`pkg-config --libs libxul`
|
|
Andrew Overholt |
ba91294 |
- export MOZILLA_INCLUDES
|
|
Andrew Overholt |
ba91294 |
- export MOZILLA_LIBS
|
|
Andrew Overholt |
ba91294 |
- MAKE_MOZILLA=make_mozilla
|
|
Andrew Overholt |
ba91294 |
+ XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
|
|
Andrew Overholt |
3b5177a |
+ XULRUNNER_LIBS="`pkg-config --libs libxul` -lxpcomglue"
|
|
Andrew Overholt |
ba91294 |
+ export XULRUNNER_INCLUDES
|
|
Andrew Overholt |
ba91294 |
+ export XULRUNNER_LIBS
|
|
Andrew Overholt |
3b5177a |
+ MAKE_MOZILLA="make_xulrunner make_xpcominit"
|
|
Andrew Overholt |
ba91294 |
else
|
|
Andrew Overholt |
ba91294 |
echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
|
|
Andrew Overholt |
ba91294 |
echo " *** Mozilla embedding support will not be compiled."
|