From baf07fa357d98783fb929d47d8802fbb3f318191 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 16 May 2010 03:57:53 +0200
Subject: 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
---
 make/build-nativewindow.xml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'make/build-nativewindow.xml')

diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index ff471d111..ee6eef03e 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -387,6 +387,11 @@
         <syslibset libs="gdi32, kernel32"/>
       </linker>
 
+      <linker id="linker.cfg.win64.mingw.nativewindow" extends="linker.cfg.win64.mingw">
+        <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
+        <syslibset libs="gdi32, kernel32"/>
+      </linker>
+
       <linker id="linker.cfg.win32.msvc.nativewindow" extends="linker.cfg.win32.msvc">
         <syslibset libs="gdi32, user32, kernel32" />
       </linker>
@@ -407,12 +412,18 @@
       <property name="linker.cfg.id.oswin"                  value="linker.cfg.win32.msvc.nativewindow" />
     </target>
     
-    <target name="c.configure.win32.mingw" if="isMingW">
+    <target name="c.configure.win32.mingw" if="isMingW32">
       <echo message="Win32.MingW" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.win32.mingw" />
       <property name="linker.cfg.id.oswin"                  value="linker.cfg.win32.mingw.nativewindow" />
     </target>
 
+    <target name="c.configure.win64.mingw" if="isMingW64">
+      <echo message="Win64.MingW" />
+      <property name="compiler.cfg.id"                      value="compiler.cfg.win64.mingw" />
+      <property name="linker.cfg.id.oswin"                  value="linker.cfg.win64.mingw.nativewindow" />
+    </target>
+
     <target name="c.configure.linux.x86" if="isLinuxX86">
       <echo message="Linux.x86" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
@@ -465,7 +476,7 @@
       <property name="linker.cfg.id.oswin"                  value="linker.cfg.hpux.nativewindow.x11" />
     </target>
 
-    <target name="c.configure.win32" depends="c.configure.win32.vc,c.configure.win32.mingw" if="isWindows" />
+    <target name="c.configure.win32" depends="c.configure.win32.vc,c.configure.win32.mingw,c.configure.win64.mingw" if="isWindows" />
 
     <target name="c.configure.x11" if="isX11" />
 
-- 
cgit v1.2.3