From 7f407a63b564bcc7d24d0904da64be14ef43047d Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 16 May 2010 20:00:42 +0200
Subject: GlueGen/JOGL Windows x86 x86_64 MingW Builds

mingw linker option: --enable-stdcall-fixup

mingw x86: link against JVM lib file, due to unresolved symbol:
            JAWT.dll x32: _JAWT_GetAWT@8 (stdcall)
            JAWT.dll x64: JAWT_GetAWT    (clean)
           Looks like the stdcall fixup doesn't work ..
---
 make/gluegen-cpptasks-base.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index 1f12008..dd366fe 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -706,13 +706,15 @@
 -->
     <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,--enable-auto-import"/>    <!-- for linking against dll directly -->
+        <linkerarg value="-Wl,--enable-stdcall-fixup"/>  <!-- for linking against dll directly -->
         <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,--enable-auto-import"/>    <!-- for linking against dll directly -->
+        <linkerarg value="-Wl,--enable-stdcall-fixup"/>  <!-- for linking against dll directly -->
         <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names, ie no __stdcall @nn -->
     </linker>
 
@@ -779,7 +781,6 @@
       <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">
-- 
cgit v1.2.3