summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-05-16 19:18:35 +0200
committerSven Gothel <[email protected]>2010-05-16 19:18:35 +0200
commitd9eab742a93a407417661368821f24b1ee4e84e1 (patch)
treee950379f9ac4adae8ccbb8799874dd4c955793de
parent8e7d075002dba3f5d5971f9c31358f074934c624 (diff)
GlueGen/JOGL Windows x86 x86_64 MingW Builds
- mingw linker option: --enable-auto-import - mingw now links against DLLs not libs, due to a runtime error while linking against JAWT 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 all junit.run tests
-rwxr-xr-xmake/gluegen-cpptasks-base.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index c470a33..1f12008 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -706,11 +706,13 @@
-->
<linker id="linker.cfg.win32.mingw" name="gcc" incremental="false">
<linkerarg value="-m32"/>
+ <linkerarg value="--enable-auto-import"/> <!-- link against dll directly (not lib)-->
<linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn -->
</linker>
<linker id="linker.cfg.win64.mingw" name="gcc" incremental="false">
<linkerarg value="-m64"/>
+ <linkerarg value="--enable-auto-import"/> <!-- link against dll directly (not lib)-->
<linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn -->
</linker>
@@ -777,12 +779,14 @@
<echo message="Win32.MingW" />
<property name="compiler.cfg.id.base" value="compiler.cfg.win32.mingw" />
<property name="linker.cfg.id.base" value="linker.cfg.win32.mingw" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/bin" /> <!-- link against dll directly (not lib)-->
</target>
<target name="gluegen.cpptasks.declare.compiler.win64.mingw" if="isMingW64">
<echo message="Win64.MingW" />
<property name="compiler.cfg.id.base" value="compiler.cfg.win64.mingw" />
<property name="linker.cfg.id.base" value="linker.cfg.win64.mingw" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/bin" /> <!-- link against dll directly (not lib)-->
</target>
<target name="gluegen.cpptasks.declare.compiler.win32" depends="gluegen.cpptasks.declare.compiler.win32.vc6,gluegen.cpptasks.declare.compiler.win32.vc7,gluegen.cpptasks.declare.compiler.win32.vc8,gluegen.cpptasks.declare.compiler.win32.vc8_x64,gluegen.cpptasks.declare.compiler.win32.vc9,gluegen.cpptasks.declare.compiler.win32.mingw,gluegen.cpptasks.declare.compiler.win64.mingw" if="isWindows">