diff options
| author | Michael Bien <[email protected]> | 2010-05-17 02:11:54 +0200 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2010-05-17 02:11:54 +0200 |
| commit | 0b5773abc6e112a1360816a3a7fa5189b7fd2474 (patch) | |
| tree | 647666aec2570dbaae81fa90aaf14c3877d524aa | |
| parent | 0f153ade9cc0ea81121d978136b0002e4df3eda5 (diff) | |
added linker.cfg.win64.mingw.jocl linker config.
| -rw-r--r-- | build.xml | 9 | ||||
| -rw-r--r-- | jocl.properties | 2 | ||||
| -rw-r--r-- | nbproject/project.properties | 7 |
3 files changed, 14 insertions, 4 deletions
@@ -177,12 +177,12 @@ <target name="jocl.configure.linker"> <linker id="linker.cfg.linux.jocl" extends="linker.cfg.linux"> - <syslibset dir="/usr/lib" libs="OpenCL" if="static.binding" unless="opencl.lib32.dir"/> + <syslibset dir="/usr/lib" libs="OpenCL" if="static.binding" unless="opencl.lib32.dir"/> <syslibset dir="${opencl.lib32.dir}" libs="OpenCL" if="opencl.lib32.dir"/> </linker> <linker id="linker.cfg.linux.amd64.jocl" extends="linker.cfg.linux.amd64" > - <syslibset dir="/usr/lib" libs="OpenCL" if="static.binding" unless="opencl.lib64.dir"/> + <syslibset dir="/usr/lib" libs="OpenCL" if="static.binding" unless="opencl.lib64.dir"/> <syslibset dir="${opencl.lib64.dir}" libs="OpenCL" if="opencl.lib64.dir"/> </linker> @@ -191,6 +191,11 @@ <syslibset dir="${opencl.lib32.dir}" libs="OpenCL" if="static.binding"/> </linker> + <linker id="linker.cfg.win64.mingw.jocl" extends="linker.cfg.win64.mingw"> + <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names --> + <syslibset dir="${opencl.lib64.dir}" libs="OpenCL" if="static.binding"/> + </linker> + <linker id="linker.cfg.macosx.jocl" extends="linker.cfg.macosx"> <linkerarg value="-framework" /> <linkerarg value="OpenCL" /> diff --git a/jocl.properties b/jocl.properties index 676ffb8c..eb2b0430 100644 --- a/jocl.properties +++ b/jocl.properties @@ -6,6 +6,8 @@ # #Windows32 ATI #opencl.lib32.dir=C:/Program Files (x86)/ATI Stream/lib/x86 +#opencl.lib64.dir=C:/Program Files (x86)/ATI Stream/lib/x86_64 # #Windows32 NVidia #opencl.lib32.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/Win32 +#opencl.lib64.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/x64
\ No newline at end of file diff --git a/nbproject/project.properties b/nbproject/project.properties index dadb96be..2662f41f 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -108,8 +108,11 @@ static.binding=true #overwrite lib path for static linking #use only if static.binding is true -#opencl.lib.dir=C:/Program Files (x86)/ATI Stream/lib/x86 -#opencl.lib.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/Win32 +#opencl.lib32.dir=C:/Program Files (x86)/ATI Stream/lib/x86 +#opencl.lib64.dir=C:/Program Files (x86)/ATI Stream/lib/x86_64 + +#opencl.lib32.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/Win32 +#opencl.lib64.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/x64 #disable the build build the native part of the bindings #c.dont.compile=true |