summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti <silenio>2006-02-13 21:28:26 +0000
committerSilenio Quarti <silenio>2006-02-13 21:28:26 +0000
commitd718815482341a0560ab299cad2c3aec2bb1a7a4 (patch)
treeae44f2c36b319b24f3a508cb52f61e2eae9a53d1
parent063cf5eff8a33ea208af9dcd435df52688761798 (diff)
downloadeclipse.platform.swt-d718815482341a0560ab299cad2c3aec2bb1a7a4.tar.gz
eclipse.platform.swt-d718815482341a0560ab299cad2c3aec2bb1a7a4.tar.xz
eclipse.platform.swt-d718815482341a0560ab299cad2c3aec2bb1a7a4.zip
100114 - SWT, launcher and support JNI libraries need to be built universal
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/make_macosx.mak7
1 files changed, 4 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/make_macosx.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/make_macosx.mak
index 0b7e6976fd..b3bdfe83b0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/make_macosx.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/make_macosx.mak
@@ -28,9 +28,10 @@ AGL_LIB=lib$(SWTAGL_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib
#NATIVE_STATS = -DNATIVE_STATS
#SWT_DEBUG = -g
-CFLAGS = -c -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) $(SWT_DEBUG) -DCARBON -I /System/Library/Frameworks/JavaVM.framework/Headers
-LFLAGS = -bundle -framework JavaVM -framework Carbon
-WEBKITCFLAGS = -c -xobjective-c -I /System/Library/Frameworks/JavaVM.framework/Headers -I /System/Library/Frameworks/Cocoa.framework/Headers -I /System/Library/Frameworks/WebKit.framework/Headers
+ARCHS = -arch i386 -arch ppc
+CFLAGS = -c $(ARCHS) -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) $(SWT_DEBUG) -DCARBON -I /System/Library/Frameworks/JavaVM.framework/Headers
+LFLAGS = -bundle $(ARCHS) -framework JavaVM -framework Carbon
+WEBKITCFLAGS = -c $(ARCHS) -xobjective-c -I /System/Library/Frameworks/JavaVM.framework/Headers -I /System/Library/Frameworks/Cocoa.framework/Headers -I /System/Library/Frameworks/WebKit.framework/Headers
WEBKITLFLAGS = $(LFLAGS) -framework WebKit -framework Cocoa
AGLLFLAGS = $(LFLAGS) -framework OpenGL -framework AGL
SWT_OBJECTS = swt.o callback.o