diff options
| author | Michael Bien <[email protected]> | 2009-09-17 03:08:21 +0200 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2009-09-17 03:08:21 +0200 |
| commit | 105aa6ed86d452245007cbfd36e712d4d5c66fa3 (patch) | |
| tree | 8a2689a890e8d299ff81758183467b4a6091c4f7 | |
| parent | 769d2721943cd74f5903a99a2f417c4aa4dc6fbc (diff) | |
fixed jvm jni include paths in build
| -rw-r--r-- | build.xml | 20 | ||||
| -rw-r--r-- | resources/CL/stdint.h | 3 | ||||
| -rw-r--r-- | resources/OpenCL.cfg | 1 |
3 files changed, 14 insertions, 10 deletions
@@ -56,20 +56,24 @@ <target name="-post-compile" depends="c.configure.linux.amd64"> - <property name="output.lib.name" value="jocl"/> <property name="obj.dir" value="${build.dir}/obj"/> + <property name="natives.dir" value="${build.dir}/natives"/> + + <property name="output.lib.name" value="jocl"/> <property name="obj.jocl.dir" value="${obj.dir}/${output.lib.name}"/> + <property name="natives.jocl.dir" value="${build.dir}/natives/${output.lib.name}"/> <property name="c.compiler.optimise" value="none"/> <property name="c.compiler.debug" value="false"/> <mkdir dir="${obj.jocl.dir}" /> + <mkdir dir="${natives.jocl.dir}" /> <echo message=" - - - compiling JOCL natives - - - "/> <cc outtype="shared" objdir="${obj.jocl.dir}" - outfile="${obj}/${output.lib.name}" + outfile="${natives.jocl.dir}/${output.lib.name}" optimize="${c.compiler.optimise}" debug="${c.compiler.debug}" multithreaded="true" @@ -80,28 +84,26 @@ <compiler extends="${compiler.cfg.id}" > + <includepath path="${java.includes.dir}"/> + <includepath path="${java.includes.dir.platform}"/> + <includepath path="${basedir}/resources"/> <includepath path="${basedir}/resources/CL"/> - <includepath path="${basedir}/resources/jvm_stubs"/> - <!-- This is for the generated headers for handwritten C code --> <!-- - <sysincludepath path="${java.includes.dir}"/> - <sysincludepath path="${java.includes.dir.platform}"/> - <includepath path="${src.generated.c}" /> <includepath path="${src.generated.c}/X11" if="isX11"/> <includepath path="${src.generated.c}/MacOSX" if="isOSX"/> <includepath path="${src.generated.c}/Windows" if="isWindows"/> --> - <!-- This must come last to not override real include paths --> - <!-- includepath path="stub_includes/macosx" if="isOSX" / --> </compiler> + <!-- <linker extends="${linker.cfg.id}"> <syslibset dir="${java.lib.dir.platform}/server" libs="jvm" if="${output.lib.name}.useLibJVM"/> </linker> + --> </cc> <echo message=" - - - JOCL natives compiled - - - "/> diff --git a/resources/CL/stdint.h b/resources/CL/stdint.h index 6db5e110..a9dd63a4 100644 --- a/resources/CL/stdint.h +++ b/resources/CL/stdint.h @@ -7,7 +7,6 @@ // typedef unsigned __int64 uint64_t; #else -// only needed for src generation, not later at compile time typedef signed char int8_t; typedef unsigned short int16_t; typedef int int32_t; @@ -20,6 +19,8 @@ typedef unsigned int uintptr_t; typedef unsigned int size_t; + + // FIXME workaround prevent re-defininition of int16_t in types.h # define __int8_t_defined /* Greatest-width integer types */ diff --git a/resources/OpenCL.cfg b/resources/OpenCL.cfg index 768ebe9f..6a39180f 100644 --- a/resources/OpenCL.cfg +++ b/resources/OpenCL.cfg @@ -25,6 +25,7 @@ Opaque long cl_kernel Opaque long cl_event Opaque long cl_sampler +# TODO doublecheck if not int Opaque long cl_platform_id Opaque long cl_device_id |