summaryrefslogtreecommitdiffstats
path: root/build.xml
diff options
context:
space:
mode:
authorMichael Bien <mbien@fh-landshut.de>2009-11-18 16:26:39 +0100
committerMichael Bien <mbien@fh-landshut.de>2009-11-18 16:26:39 +0100
commit4ac3f56ec3841a8fae7cc60635c85cf0518764b5 (patch)
tree953aa2a497be645c7a9c733c94af2fdb8a89ceef /build.xml
parent76d77bb135fb67fb88c269670c5daf5cccef01f4 (diff)
seperated crosscompiler configuration into seperate build file.
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml79
1 files changed, 4 insertions, 75 deletions
diff --git a/build.xml b/build.xml
index b483e3f4..cd8d7351 100644
--- a/build.xml
+++ b/build.xml
@@ -78,76 +78,11 @@
</target>
+ <target name="-post-compile" depends="c.compile.default" />
- <target name="-post-compile" depends="cross-compile-on-linux64, c.compile.default" />
-
- <target name="c.compile.default" depends="gluegen.cpptasks.detect.os, c.compile" />
-
- <!-- crosscompiles to other platforms, requirement: linux64 host os -->
- <target name="cross-compile-on-linux64" if="crosscompile" depends="init">
-
- <echo message=" - - - cross-compiling JOCL natives - - - "/>
-
- <antcall target="c.compile" inheritall="false">
- <param name="namespace" value="linux-amd64"/>
- <param name="crosscompile" value="true"/>
- <param name="build.dir" value="${build.dir}"/>
- <param name="isLinuxAMD64" value="true"/>
- <param name="isLinux" value="true"/>
- <param name="isUnix" value="true"/>
- <param name="isX11" value="true"/>
- </antcall>
-
- <antcall target="c.compile" inheritall="false">
- <param name="namespace" value="linux-x86"/>
- <param name="crosscompile" value="true"/>
- <param name="build.dir" value="${build.dir}"/>
- <param name="isLinuxX86" value="true"/>
- <param name="isLinux" value="true"/>
- <param name="isUnix" value="true"/>
- <param name="isX11" value="true"/>
- </antcall>
-
- <!-- TODO remove hardcoded path -->
- <property name="java.includes.dir.windows" value="/media/store/JOCLSetup/win32"/>
-
- <!-- use mingw crosscompiler to compile for win32 and win64 (linux64 only) -->
- <antcall target="c.compile" inheritall="false">
- <param name="namespace" value="linux-amd64"/>
- <param name="crosscompile" value="true"/>
- <param name="build.dir" value="${build.dir}"/>
- <param name="isLinuxAMD64" value="true"/>
- <param name="isLinux" value="true"/>
- <param name="isUnix" value="true"/>
- <param name="isX11" value="true"/>
-
- <!-- overwrite -->
- <param name="java.includes.dir.platform" value="${java.includes.dir.windows}"/>
- <param name="compiler.cfg.id" value="compiler.cfg.linux64.mingw64"/>
- <param name="linker.cfg.id" value="linker.cfg.linux64.mingw64.jocl"/>
- </antcall>
-
- <antcall target="c.compile" inheritall="false">
- <param name="namespace" value="linux-x86"/>
- <param name="crosscompile" value="true"/>
- <param name="build.dir" value="${build.dir}"/>
- <param name="isLinuxX86" value="true"/>
- <param name="isLinux" value="true"/>
- <param name="isUnix" value="true"/>
- <param name="isX11" value="true"/>
-
- <!-- overwrite -->
- <param name="java.includes.dir.platform" value="${java.includes.dir.windows}"/>
- <param name="compiler.cfg.id" value="compiler.cfg.linux64.mingw32"/>
- <param name="linker.cfg.id" value="linker.cfg.linux64.mingw32.jocl"/>
- </antcall>
-
- <echo message=" - - - JOCL natives cross-compiled - - - "/>
+ <target name="c.compile.default" depends="gluegen.cpptasks.detect.os, jocl.c.compile" />
- </target>
-
-
- <target name="c.compile" depends="c.setup.build">
+ <target name="jocl.c.compile" depends="c.setup.build">
<echo message=" - - - compiling JOCL natives - - - "/>
<echo message="${compiler.cfg.id}"/>
@@ -206,6 +141,7 @@
<!-- linker configuration -->
<target name="jocl.configure.linker">
+
<linker id="linker.cfg.linux.jocl" extends="linker.cfg.linux">
<syslibset dir="/usr/lib" libs="OpenCL"/>
</linker>
@@ -224,13 +160,6 @@
<linkerarg value="OpenCL" />
</linker>
- <linker id="linker.cfg.linux64.mingw64.jocl" extends="linker.cfg.linux64.mingw64">
- <syslibset dir="${basedir}/lib/OpenCL/linux/amd64" libs="OpenCL"/>
- </linker>
-
- <linker id="linker.cfg.linux64.mingw32.jocl" extends="linker.cfg.linux64.mingw32">
- <syslibset dir="${basedir}/lib/OpenCL/linux/x86" libs="OpenCL"/>
- </linker>
</target>
<!-- configure for current platform -->