summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorMichael Bien <[email protected]>2010-08-28 19:36:36 +0200
committerMichael Bien <[email protected]>2010-08-28 19:36:36 +0200
commita68be2859454b75539cc5e44eb23129745932db3 (patch)
treec85ba69da273c56cce31209d24b0697e814b6ee1 /make
parentb2e62b0b3f864cc8369baf4b99e0b709452a5153 (diff)
attempt to fix CCE in windows compiler config.
Diffstat (limited to 'make')
-rwxr-xr-xmake/build.xml18
1 files changed, 6 insertions, 12 deletions
diff --git a/make/build.xml b/make/build.xml
index 8b17204..710d0ef 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -201,27 +201,21 @@
-->
<target name="c.configure.win.mingw32" if="isMingW32">
<echo message="Win.Ming32W" />
- <linker id="linker.cfg.win32.mingw.joal" extends="linker.cfg.win32.mingw">
- <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names -->
- </linker>
+ <property name="java.includes.dir.platform" value="${java.includes.dir.win32}" />
<property name="compiler.cfg.id" value="compiler.cfg.win32.mingw" />
- <property name="linker.cfg.id" value="linker.cfg.win32.mingw.joal" />
+ <property name="linker.cfg.id" value="linker.cfg.win32.mingw" />
</target>
<target name="c.configure.win.mingw64" if="isMingW64">
- <echo message="Win.Ming64W" />
- <linker id="linker.cfg.win64.mingw.joal" extends="linker.cfg.win64.mingw">
- <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names -->
- </linker>
+ <echo message="Win.Ming64W" />
+ <property name="java.includes.dir.platform" value="${java.includes.dir.win64}" />
<property name="compiler.cfg.id" value="compiler.cfg.win64.mingw" />
- <property name="linker.cfg.id" value="linker.cfg.win64.mingw.joal" />
+ <property name="linker.cfg.id" value="linker.cfg.win64.mingw" />
</target>
- <target name="declare.win32" depends="c.configure.win.mingw32,c.configure.win.mingw64" if="isWindows">
- <property name="java.includes.dir.platform" value="${java.includes.dir.win32}" />
- </target>
+ <target name="declare.win32" depends="c.configure.win.mingw32,c.configure.win.mingw64" if="isWindows"/>
<target name="declare.linux.x86" if="isLinux" unless="isLinuxAMD64">
<echo message="Linux.x86" />