diff options
| -rwxr-xr-x | make/build.xml | 42 |
1 files changed, 16 insertions, 26 deletions
diff --git a/make/build.xml b/make/build.xml index fe55231..8b17204 100755 --- a/make/build.xml +++ b/make/build.xml @@ -199,37 +199,27 @@ <!-- - Platform specific declares. --> - <target name="declare.win32.vc6" if="isVC6"> - <echo message="Win32.VC6" /> - <property name="compiler.cfg.id" value="compiler.cfg.win32.msvc" /> - <property name="linker.cfg.id" value="linker.cfg.win32.msvc" /> - </target> - - <target name="declare.win32.vc7" if="isVC7"> - <echo message="Win32.VC7" /> - <property name="compiler.cfg.id" value="compiler.cfg.win32.msvc" /> - <property name="linker.cfg.id" value="linker.cfg.win32.msvc" /> - </target> - - <target name="declare.win32.vc8" if="isVC8"> - <echo message="Win32.VC8" /> - <property name="compiler.cfg.id" value="compiler.cfg.win32.msvc" /> - <property name="linker.cfg.id" value="linker.cfg.win32.msvc" /> - </target> + <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> - <target name="declare.win32.vc8_x64" if="isVC8_X64"> - <echo message="Win32.VC8_X64" /> - <property name="compiler.cfg.id" value="compiler.cfg.win32.msvc" /> - <property name="linker.cfg.id" value="linker.cfg.win32.msvc" /> + <property name="compiler.cfg.id" value="compiler.cfg.win32.mingw" /> + <property name="linker.cfg.id" value="linker.cfg.win32.mingw.joal" /> </target> - <target name="declare.win32.mingw" if="isMingw"> - <echo message="Win32.MingW" /> - <property name="compiler.cfg.id" value="compiler.cfg.win32.mingw" /> - <property name="linker.cfg.id" value="linker.cfg.win32.mingw" /> + <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> + + <property name="compiler.cfg.id" value="compiler.cfg.win64.mingw" /> + <property name="linker.cfg.id" value="linker.cfg.win64.mingw.joal" /> </target> - <target name="declare.win32" depends="declare.win32.vc6,declare.win32.vc7,declare.win32.vc8,declare.win32.vc8_x64,declare.win32.mingw" if="isWindows"> + <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> |