diff options
| -rw-r--r-- | build.xml | 10 | ||||
| -rw-r--r-- | nbproject/project.properties | 4 |
2 files changed, 7 insertions, 7 deletions
@@ -170,18 +170,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="user.libpath"/> - <syslibset dir="${user.libpath}" libs="OpenCL" if="user.libpath"/> + <syslibset dir="/usr/lib" libs="OpenCL" if="static.binding" unless="opencl.lib.dir"/> + <syslibset dir="${opencl.lib.dir}" libs="OpenCL" if="opencl.lib.dir"/> </linker> <linker id="linker.cfg.linux.amd64.jocl" extends="linker.cfg.linux.amd64" > - <syslibset dir="/usr/lib" libs="OpenCL" if="static.binding" unless="user.libpath"/> - <syslibset dir="${user.libpath}" libs="OpenCL" if="user.libpath"/> + <syslibset dir="/usr/lib" libs="OpenCL" if="static.binding" unless="opencl.lib.dir"/> + <syslibset dir="${opencl.lib.dir}" libs="OpenCL" if="opencl.lib.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="${user.libpath}" libs="OpenCL" if="static.binding"/> + <syslibset dir="${opencl.lib.dir}" libs="OpenCL" if="static.binding"/> </linker> <linker id="linker.cfg.macosx.jocl" extends="linker.cfg.macosx"> diff --git a/nbproject/project.properties b/nbproject/project.properties index 56928e91..ea1f7c80 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -108,5 +108,5 @@ static.binding=true #overwrite lib path for static linking #use only if static.binding is true -#user.libpath=C:/Program Files (x86)/ATI Stream/lib/x86 -#user.libpath=C:/NVIDIAComputingSDK/OpenCL/common/lib/Win32
\ No newline at end of file +#opencl.lib.dir=C:/Program Files (x86)/ATI Stream/lib/x86 +#opencl.lib.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/Win32
\ No newline at end of file |