Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Gayed2012-03-07 20:38:17 +0000
committerGrant Gayed2012-03-07 20:38:17 +0000
commit0baf41d40f3dd8716522c72f50e1eb2c9697bedd (patch)
treeb55680cdc5b4e05345c795ca58854412ae9aae5c
parent08a80086fefbcec9f8715d51ad45d533cfcc4ef0 (diff)
downloadeclipse.platform.swt-0baf41d40f3dd8716522c72f50e1eb2c9697bedd.tar.gz
eclipse.platform.swt-0baf41d40f3dd8716522c72f50e1eb2c9697bedd.tar.xz
eclipse.platform.swt-0baf41d40f3dd8716522c72f50e1eb2c9697bedd.zip
last OS X XULRunner tweaks
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
index ed7f08d1cc..50b3655417 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
@@ -40,7 +40,7 @@ SWT_OBJECTS = swt.o c.o c_stats.o callback.o
SWTPI_OBJECTS = swt.o os.o os_structs.o os_stats.o os_custom.o
XULRUNNER_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
-XULRUNNERCFLAGS = -c -fshort-wchar -Wall $(ARCHS) -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) $(SWT_DEBUG) -DUSE_ASSEMBLER -DCOCOA -I /System/Library/Frameworks/JavaVM.framework/Headers \
+XULRUNNERCFLAGS = -c -Wall $(ARCHS) -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) $(SWT_DEBUG) -DUSE_ASSEMBLER -DCOCOA -I /System/Library/Frameworks/JavaVM.framework/Headers \
-Wno-non-virtual-dtor -include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include
XULRUNNERLFLAGS = $(LFLAGS)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h
index 78f7a93d9e..5155e3f77e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h
@@ -20,6 +20,7 @@
#include <Carbon/Carbon.h>
#include <WebKit/WebKit.h>
#include <JavaScriptCore/JavaScriptCore.h>
+#include "/usr/include/mach-o/dyld.h"
#include "os_custom.h"

Back to the top