summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2008-02-09 04:47:30 +0000
committerKenneth Russel <[email protected]>2008-02-09 04:47:30 +0000
commit7181447bb3043f326f1f6b018f5f41478146ba1d (patch)
tree89f0c4e69c8a2de0e44aa3bad2034dbd7a1a6811
parent0cd7dbaae5bd4b4bdacaf147c522cc39465354b1 (diff)
Modified gluegen-cpptasks, gluegen.properties and jogl.properties to
support building 64-bit on Leopard git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/gluegen/trunk@71 a78bb65f-1512-4460-ba86-f6dc96a7bf27
-rwxr-xr-xmake/gluegen-cpptasks.xml6
-rwxr-xr-xmake/gluegen.properties4
2 files changed, 10 insertions, 0 deletions
diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml
index 2111cba..48b881b 100755
--- a/make/gluegen-cpptasks.xml
+++ b/make/gluegen-cpptasks.xml
@@ -454,6 +454,9 @@
<compilerarg value="ppc" if="macosxfat"/>
<compilerarg value="-arch" if="macosxfat"/>
<compilerarg value="i386" if="macosxfat"/>
+ <compilerarg value="-arch" if="macosx64fat"/>
+ <compilerarg value="x86_64" if="macosx64fat"/>
+ <!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard -->
<compilerarg value="-Wmost" />
<compilerarg value="-ObjC" />
<defineset>
@@ -522,6 +525,9 @@
<linkerarg value="ppc" if="macosxfat"/>
<linkerarg value="-arch" if="macosxfat"/>
<linkerarg value="i386" if="macosxfat"/>
+ <linkerarg value="-arch" if="macosx64fat"/>
+ <linkerarg value="x86_64" if="macosx64fat"/>
+ <!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard -->
</linker>
<linker id="linker.cfg.hpux" name="aCC">
diff --git a/make/gluegen.properties b/make/gluegen.properties
index 81aba60..cf69cac 100755
--- a/make/gluegen.properties
+++ b/make/gluegen.properties
@@ -27,3 +27,7 @@ win32.c.compiler=vc6
# on a Mac OS X system supporting cross-compilation and want to
# generate fat (PPC and x86) binaries, uncomment the property below
# macosxfat=true
+# If you are building on a 64-bit Mac OS X system supporting
+# cross-compilation and want to generate fat (PPC64 and x86_64) binaries,
+# uncomment the property below
+# macosx64fat=true