From 129e783741d91e9ee5cd7da5d5c962c32ec96b0b Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Tue, 17 Nov 2009 20:43:07 +0100
Subject: Added quick hack to simplify crosscompilation with cpptasks. CppTasks
 uses a hardcoded command (compiler name) to invoke the specified compiler
 which makes crosscompilation with multiple versions of e.g gcc hard.
 Temporary disabled suncc compiler configuration since it does not work with
 cpptasks 1.0b5.

---
 make/gluegen-cpptasks.xml             |  28 +++++++++++++++++++++++++---
 make/lib/CppTasksGCCNamespaceHack.jar | Bin 0 -> 7810 bytes
 make/lib/cpptasks.jar                 | Bin 345356 -> 363963 bytes
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 make/lib/CppTasksGCCNamespaceHack.jar
 mode change 100755 => 100644 make/lib/cpptasks.jar

(limited to 'make')

diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml
index 3640052..d293843 100755
--- a/make/gluegen-cpptasks.xml
+++ b/make/gluegen-cpptasks.xml
@@ -127,7 +127,7 @@
   <import file="gluegen-properties.xml" />
 
   <!-- import cpptasks -->
-  <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar"/>
+  <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar;${gluegen.root}/make/lib/CppTasksGCCNamespaceHack.jar"/>
 
   <condition property="gluegen.user.compiler.file"
              value="${user.home}/gluegen.compiler.xml">
@@ -495,6 +495,16 @@
       <compilerarg value="-m64"/>
     </compiler>
 
+    <compiler id="compiler.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.Gcc64CCompiler">
+        <compilerarg value="-fPIC"/>
+        <compilerarg value="-m64"/>
+    </compiler>
+
+    <compiler id="compiler.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.Gcc32CCompiler">
+        <compilerarg value="-m32"/>
+    </compiler>
+
+<!--
     <compiler id="compiler.cfg.solaris" name="suncc">
       <defineset>
         <define name="SOLARIS" />
@@ -509,16 +519,20 @@
         <define name="SOLARIS" />
       </defineset>
     </compiler>
-
+-->
+<!--
     <compiler id="compiler.cfg.solaris.amd64" name="suncc">
       <compilerarg value="-fast" />
       <compilerarg value="-xchip=opteron" />
       <compilerarg value="-xarch=amd64" />
+      -->
   <!--      <compilerarg value="-xcache=64/64/2:1024/64/16" />   -->
+<!--
       <defineset>
         <define name="SOLARIS" />
       </defineset>
     </compiler>
+      -->
 
     <compiler id="compiler.cfg.win32.mingw" name="gcc">
       <compilerarg value="-g" if="c.compiler.use-debug"/> 
@@ -619,6 +633,14 @@
         <linkerarg value="-m64"/>
     </linker>
 
+    <linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.Gcc64Linker">
+        <linkerarg value="-m64"/>
+    </linker>
+    
+    <linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.Gcc32Linker">
+        <linkerarg value="-m32"/>
+    </linker>
+<!--
     <linker id="linker.cfg.solaris" name="suncc">
     </linker>
 
@@ -629,7 +651,7 @@
     <linker id="linker.cfg.solaris.amd64" name="suncc">
       <linkerarg value="-xarch=amd64" />
     </linker>
-
+-->
     <linker id="linker.cfg.win32.mingw" name="gcc" incremental="false">
       <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
     </linker>
diff --git a/make/lib/CppTasksGCCNamespaceHack.jar b/make/lib/CppTasksGCCNamespaceHack.jar
new file mode 100644
index 0000000..c31779e
Binary files /dev/null and b/make/lib/CppTasksGCCNamespaceHack.jar differ
diff --git a/make/lib/cpptasks.jar b/make/lib/cpptasks.jar
old mode 100755
new mode 100644
index 005691c..dec6c13
Binary files a/make/lib/cpptasks.jar and b/make/lib/cpptasks.jar differ
-- 
cgit v1.2.3