summaryrefslogtreecommitdiffstats
path: root/make/gluegen-properties.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-05-16 03:56:45 +0200
committerSven Gothel <[email protected]>2010-05-16 03:56:45 +0200
commit8e7d075002dba3f5d5971f9c31358f074934c624 (patch)
treeb9e58a49a9eb7c68dc9888c25e4347edcb0cf49e /make/gluegen-properties.xml
parentd86ab08912944bdd76bd91dcb86ffd291986cfc7 (diff)
GlueGen/JOGL Windows x86 x86_64 Builds
x86: Using mingw 20100514, gcc 4.5.0 - clean - passed all junit.run tests x86_64: Using mingw-w64-bin_x86_64-mingw_20100515_sezero.zip, gcc 4.4.5 20100513 - clean - passed most junit.run tests, still buggy
Diffstat (limited to 'make/gluegen-properties.xml')
-rwxr-xr-xmake/gluegen-properties.xml18
1 files changed, 16 insertions, 2 deletions
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml
index a7c6315..949eadf 100755
--- a/make/gluegen-properties.xml
+++ b/make/gluegen-properties.xml
@@ -7,7 +7,7 @@
- externally:
-
- win32.c.compiler (required to be set on Windows):
- - one of "vc6", "vc7", "vc8", or "mingw".
+ - one of "vc6", "vc7", "vc8", "mingw32" (default) or "mingw64".
- c.compiler.debug:
- set to "true" if debug version of the compiled
- C code is desired.
@@ -41,7 +41,21 @@
<echo message="Loaded ${gluegen.user.properties.file.set}." />
<property name="antlr.jar" value="${gluegen.root}/make/lib/antlr.jar" />
<property name="junit.jar" value="${gluegen.root}/make/lib/junit.jar" />
- <property name="win32.c.compiler" value="mingw" />
+ <condition property="win32.c.compiler" value="mingw64">
+ <and>
+ <os family="windows" />
+ <os arch="amd64" />
+ </and>
+ </condition>
+ <condition property="win32.c.compiler" value="mingw32">
+ <and>
+ <os family="windows" />
+ <or>
+ <os arch="i386" />
+ <os arch="x86" />
+ </or>
+ </and>
+ </condition>
<echo message="antlr.jar=${antlr.jar}" />
<echo message="junit.jar=${junit.jar}" />
<echo message="win32.c.compiler=${win32.c.compiler}" />