diff options
| author | Sven Gothel <[email protected]> | 2010-05-18 03:59:59 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-05-18 03:59:59 +0200 |
| commit | 133cd255940c72410b06ca8b97e60b4a03438c89 (patch) | |
| tree | 5cc188966b06d0ad2fbf5417231fe0c6dd455013 | |
| parent | fffde773390e832d9c9e9410c3d01145807372a1 (diff) | |
Fix JOCL win64 build - mingw64 shall ling against dll
| -rw-r--r-- | jocl.properties | 20 | ||||
| -rw-r--r-- | scripts/make.jocl.all.linux-x86.sh | 9 | ||||
| -rw-r--r-- | scripts/make.jocl.all.win64.bat | 12 |
3 files changed, 34 insertions, 7 deletions
diff --git a/jocl.properties b/jocl.properties index eb2b0430..f6fd206a 100644 --- a/jocl.properties +++ b/jocl.properties @@ -2,12 +2,18 @@ # alternatively use nbproject/private/private.properties for storing private properties # or edit nbproject/project.properties directly. -#overwrite lib path for static linking +# overwrite lib path for linking at compile time # -#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 +# Windows ATI +# opencl.lib32.dir=C:/Program Files (x86)/ATI Stream/lib/x86 +# opencl.lib64.dir=C:/Program Files (x86)/ATI Stream/lib/x86_64 +# - doesn't work with mingw64, see below: # -#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 +# Windows NVidia +# opencl.lib32.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/Win32 +# opencl.lib64.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/x64 +# doesn't work with mingw64, see below: + +# Windows 64bit mingw64 must link against the OpenCL.dll, +# otherwise SIGV messages are produced. +# opencl.lib64.dir=C:/Windows/system32 diff --git a/scripts/make.jocl.all.linux-x86.sh b/scripts/make.jocl.all.linux-x86.sh new file mode 100644 index 00000000..9ae8b770 --- /dev/null +++ b/scripts/make.jocl.all.linux-x86.sh @@ -0,0 +1,9 @@ +#! /bin/sh + +if [ -e ../setenv-build-jogl-x86.sh ] ; then + . ../setenv-build-jogl-x86.sh +fi + +ant \ + -Drootrel.build=build-x86 \ + $* 2>&1 | tee make.jocl.all.linux-x86.log diff --git a/scripts/make.jocl.all.win64.bat b/scripts/make.jocl.all.win64.bat new file mode 100644 index 00000000..7fd32e96 --- /dev/null +++ b/scripts/make.jocl.all.win64.bat @@ -0,0 +1,12 @@ +set THISDIR="C:\JOGL"
+
+set J2RE_HOME=c:\jre1.6.0_20_x64
+set JAVA_HOME=c:\jdk1.6.0_20_x64
+set ANT_PATH=C:\apache-ant-1.8.0
+
+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%
+
+set LIB_GEN=%THISDIR%\lib
+set CLASSPATH=.;%THISDIR%\build-win64\classes
+
+ant -Drootrel.build=build-win64 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jocl.all.win64.log 2>&1
|