summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
diff options
context:
space:
mode:
authorGrant Gayed <ggayed>2009-04-08 18:54:52 +0000
committerGrant Gayed <ggayed>2009-04-08 18:54:52 +0000
commit2177973a521d0eada801b33df10034dd8a9f4625 (patch)
tree1bdd5eadd1bf96ab29cc6c23566c89152e4c1aa8 /bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
parenta15e74fa4fc558db41d7b6459560396680bcb2a9 (diff)
downloadeclipse.platform.swt-2177973a521d0eada801b33df10034dd8a9f4625.tar.gz
eclipse.platform.swt-2177973a521d0eada801b33df10034dd8a9f4625.tar.xz
eclipse.platform.swt-2177973a521d0eada801b33df10034dd8a9f4625.zip
259687 - Javascript executes asynchronously with xulrunner 1.9
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak13
1 files changed, 9 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
index e5d4c1acf2..e7b6b13d8b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
@@ -80,6 +80,11 @@ MOZILLACFLAGS = -O \
MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
-DNO__1XPCOMGlueStartup \
+ -DNO_JS_1EvaluateUCScriptForPrincipals \
+ -DNO__1nsIScriptContext_1GetNativeContext \
+ -DNO__1nsIScriptGlobalObject_1GetScriptContext \
+ -DNO__1nsIScriptGlobalObject_1GetScriptGlobal \
+ -DNO__1nsIScriptGlobalObject_1EnsureScriptEnvironment \
-DNO__1XPCOMGlueLoadXULFunctions \
-DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
-DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
@@ -239,16 +244,16 @@ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
xpcomxul.o: xpcom.cpp
- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+ $(CXX) -o xpcomxul.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
xpcomxul_structs.o: xpcom_structs.cpp
- $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
+ $(CXX) -o xpcomxul_structs.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
xpcomxul_custom.o: xpcom_custom.cpp
- $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
+ $(CXX) -o xpcomxul_custom.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
xpcomxul_stats.o: xpcom_stats.cpp
- $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
+ $(CXX) -o xpcomxul_stats.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
#
# XPCOMInit lib