started with dynamic-binding-only build option.

added user.libpath property for user specified library linking.
sgothel · May 8, 2010 · c3871d2 · c3871d2
1 parent 0d8576e
commit c3871d2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/build.xml b/build.xml
@@ -113,7 +113,7 @@
 
         <mkdir dir="${obj.jocl.dir}/${namespace}" />
         <mkdir dir="${natives.jocl.dir}/${namespace}" />
-
+        
         <cc outtype="shared"
             objdir="${obj.jocl.dir}/${namespace}"
             outfile="${natives.jocl.dir}/${namespace}/${output.lib.name}"
@@ -170,17 +170,18 @@
     <target name="jocl.configure.linker">
 
         <linker id="linker.cfg.linux.jocl" extends="linker.cfg.linux">
-            <syslibset dir="/usr/lib" libs="OpenCL"/>
+            <syslibset dir="/usr/lib"        libs="OpenCL"  if="static.binding" unless="user.libpath"/>
+            <syslibset dir="${user.libpath}" libs="OpenCL"  if="user.libpath"/>
         </linker>
 
         <linker id="linker.cfg.linux.amd64.jocl" extends="linker.cfg.linux.amd64" >
-            <syslibset dir="/usr/lib" libs="OpenCL"/>
+            <syslibset dir="/usr/lib"        libs="OpenCL"  if="static.binding" unless="user.libpath"/>
+            <syslibset dir="${user.libpath}" libs="OpenCL"  if="user.libpath"/>
         </linker>
 
         <linker id="linker.cfg.win32.mingw.jocl" extends="linker.cfg.win32.mingw">
             <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names -->
-            <syslibset dir="C:/Program Files (x86)/ATI Stream/lib/x86" libs="OpenCL"/>
-       <!-- <syslibset dir="C:/NVIDIAComputingSDK/OpenCL/common/lib/Win32" libs="OpenCL"/> -->
+            <syslibset dir="${user.libpath}" 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
@@ -104,3 +104,9 @@ src.native.dir=gensrc/native
 test.src.dir=test
 
 #crosscompile=true
+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
diff --git a/resources/cl-impl.cfg b/resources/cl-impl.cfg
@@ -19,7 +19,7 @@ ProcAddressTableClassName CLProcAddressTable
 GetProcAddressTableExpr addressTable
 ProcAddressNameExpr $UpperCase(arg)
 
-#dynamic binding for OpenGL specific functions
+#dynamic binding for OpenGL specific functions...
 ForceProcAddressGen clGetGLContextInfoKHR
 ForceProcAddressGen clCreateFromGLBuffer
 ForceProcAddressGen clCreateFromGLRenderbuffer
@@ -31,6 +31,9 @@ ForceProcAddressGen clGetGLObjectInfo
 ForceProcAddressGen clGetGLTextureInfo
 ForceProcAddressGen clIcdGetPlatformIDsKHR
 
+#...or force all
+#ForceProcAddressGen __ALL__
+
 Unignore clGetExtensionFunctionAddress
 RenameJavaMethod clGetExtensionFunctionAddress clGetExtensionFunctionAddressImpl
 AccessControl clGetExtensionFunctionAddressImpl PRIVATE