summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Barnes <krbarnes>2008-11-21 15:34:35 +0000
committerKevin Barnes <krbarnes>2008-11-21 15:34:35 +0000
commit3733f9d79c0b0b21ed0d7d2d1a6011ee7968bdee (patch)
tree9252f45c25b50a5ff430c19ccb63a16267bc21bf
parent5f550013f9fd8c397a7fd012819fee7fc278b9d5 (diff)
downloadeclipse.platform.swt-3733f9d79c0b0b21ed0d7d2d1a6011ee7968bdee.tar.gz
eclipse.platform.swt-3733f9d79c0b0b21ed0d7d2d1a6011ee7968bdee.tar.xz
eclipse.platform.swt-3733f9d79c0b0b21ed0d7d2d1a6011ee7968bdee.zip
239301 - Support 64-bit on Cocoa
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.xml2
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak5
2 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.xml b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.xml
index ce97518039..6cc614170a 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.xml
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.xml
@@ -25,7 +25,7 @@
<target name="build_cocoa_lib_x86_64" depends="init">
<exec dir="./bin/library" executable="sh">
<arg line="${basedir}/bin/library/build64.sh"/>
- <arg value="install"/>
+ <arg value="install_x86_64"/>
</exec>
<eclipse.refreshLocal resource="org.eclipse.swt.cocoa.macosx.x86_64" depth="infinite" />
</target>
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 f046a09ea9..0290596f81 100755
--- 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
@@ -49,6 +49,8 @@ XULRUNNERLFLAGS = $(LFLAGS)
all: $(SWT_LIB) $(SWTPI_LIB) $(AWT_LIB) $(XULRUNNER_LIB)
+all_x86_64: $(SWT_LIB) $(SWTPI_LIB) $(AWT_LIB)
+
.c.o:
cc $(CFLAGS) $*.c
@@ -81,6 +83,9 @@ xpcominit_stats.o: xpcominit_stats.cpp
install: all
cp *.jnilib $(OUTPUT_DIR)
+
+install_x86_64: all_x86_64
+ cp *.jnilib $(OUTPUT_DIR)
clean:
rm -f *.jnilib *.o