diff options
| author | Michael Bien <[email protected]> | 2010-05-17 01:54:01 +0200 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2010-05-17 01:54:01 +0200 |
| commit | 0f153ade9cc0ea81121d978136b0002e4df3eda5 (patch) | |
| tree | e099dafe80a6fe41771deeb1978e56589c9cb3fc | |
| parent | 6ff9c05d0a2f5d6131d775840470371cf0090896 (diff) | |
splitted opencl.lib.dir into opencl.lib32.dir and opencl.lib64.dir.
| -rw-r--r-- | build.xml | 10 | ||||
| -rw-r--r-- | jocl.properties | 4 |
2 files changed, 7 insertions, 7 deletions
@@ -177,18 +177,18 @@ <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.lib.dir"/> - <syslibset dir="${opencl.lib.dir}" libs="OpenCL" if="opencl.lib.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.lib.dir"/> - <syslibset dir="${opencl.lib.dir}" libs="OpenCL" if="opencl.lib.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> <linker id="linker.cfg.win32.mingw.jocl" extends="linker.cfg.win32.mingw"> <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names --> - <syslibset dir="${opencl.lib.dir}" libs="OpenCL" if="static.binding"/> + <syslibset dir="${opencl.lib32.dir}" libs="OpenCL" if="static.binding"/> </linker> <linker id="linker.cfg.macosx.jocl" extends="linker.cfg.macosx"> diff --git a/jocl.properties b/jocl.properties index ba3ea334..676ffb8c 100644 --- a/jocl.properties +++ b/jocl.properties @@ -5,7 +5,7 @@ #overwrite lib path for static linking # #Windows32 ATI -#opencl.lib.dir=C:/Program Files (x86)/ATI Stream/lib/x86 +#opencl.lib32.dir=C:/Program Files (x86)/ATI Stream/lib/x86 # #Windows32 NVidia -#opencl.lib.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/Win32 +#opencl.lib32.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/Win32 |