diff options
author | Sven Gothel <[email protected]> | 2010-05-16 19:22:33 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-05-16 19:22:33 +0200 |
commit | ec97d04c711cb12f175ab0176345a6f0e7091f36 (patch) | |
tree | 5adb20703b2a4fba6b0d539805f4f2d15e67525b | |
parent | baf07fa357d98783fb929d47d8802fbb3f318191 (diff) |
GlueGen/JOGL Windows x86 x86_64 MingW Builds
Property change to allow multilib with same property file:
- windows.cg.lib -> windows.cg.lib32 windows.cg.lib64
- x11.cg.lib -> x11.cg.lib32 x11.cg.lib64
Fix windows build/test scripts ..
++++
- mingw linker option: --enable-auto-import
- mingw now links against DLLs not libs,
due to a runtime error while linking against JAWT
++++
x86: Using mingw 20100514, gcc 4.5.0
- clean
- passed all junit.run tests
x86_64: Using mingw-w64-bin_x86_64-mingw_20100515_sezero.zip, gcc 4.4.5 20100513
- clean
- passed all junit.run tests
-rw-r--r-- | make/build-jogl.xml | 18 | ||||
-rw-r--r-- | make/jogl.properties | 6 | ||||
-rw-r--r-- | make/scripts/java-win64-dbg.bat | 4 | ||||
-rw-r--r-- | make/scripts/java-win64.bat | 4 | ||||
-rw-r--r-- | make/scripts/make.jogl.all.win32.bat | 2 | ||||
-rw-r--r-- | make/scripts/make.jogl.all.win64.bat | 2 |
6 files changed, 20 insertions, 16 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 63d9c84ff..27ec68718 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -39,8 +39,10 @@ - -Djogl.cg=1 when combined with the build or javadoc targets will cause - the experimental binding to NVidia's Cg language to be built. - Then you need to define the location of your CG libraries: - - -Dwindows.cg.lib=<PATH> for Windows and - - -Dx11.cg.lib=<PATH> for X11/Unix + - -Dwindows.cg.lib32=<PATH> for Windows x32 and + - -Dwindows.cg.lib64=<PATH> for Windows x64 and + - -Dx11.cg.lib32=<PATH> for X11/Unix x32 + - -Dx11.cg.lib64=<PATH> for X11/Unix x64 - - Thanks to Rob Grzywinski and Artur Biesiadowski for the bulk of the - ANT build, including the GlueGen and StaticGLInfo tasks, the building of @@ -1108,7 +1110,7 @@ </linker> <linker id="linker.cfg.linux.jogl.cg" extends="linker.cfg.linux.jogl.gl2"> - <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL"/> + <syslibset dir="${x11.cg.lib32}" libs="Cg, CgGL"/> </linker> <linker id="linker.cfg.linux.amd64.jogl.x11" extends="linker.cfg.linux.amd64"> @@ -1121,7 +1123,7 @@ </linker> <linker id="linker.cfg.linux.amd64.jogl.cg" extends="linker.cfg.linux.amd64.jogl.gl2"> - <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL"/> + <syslibset dir="${x11.cg.lib64}" libs="Cg, CgGL"/> </linker> <linker id="linker.cfg.solaris.jogl.x11" extends="linker.cfg.solaris"> @@ -1133,7 +1135,7 @@ </linker> <linker id="linker.cfg.solaris.jogl.cg" extends="linker.cfg.solaris.jogl.gl2"> - <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL"/> + <syslibset dir="${x11.cg.lib32}" libs="Cg, CgGL"/> </linker> <linker id="linker.cfg.solaris.sparcv9.jogl.gl2" extends="linker.cfg.solaris.sparcv9"> @@ -1154,7 +1156,7 @@ </linker> <linker id="linker.cfg.win32.mingw.jogl.cg" extends="linker.cfg.win32.mingw.jogl"> - <syslibset dir="${windows.cg.lib}" libs="cg, cgGL"/> + <syslibset dir="${windows.cg.lib32}" libs="cg, cgGL"/> </linker> <linker id="linker.cfg.win64.mingw.jogl" extends="linker.cfg.win64.mingw"> @@ -1163,7 +1165,7 @@ </linker> <linker id="linker.cfg.win64.mingw.jogl.cg" extends="linker.cfg.win64.mingw.jogl"> - <syslibset dir="${windows.cg.lib}" libs="cg, cgGL"/> + <syslibset dir="${windows.cg.lib64}" libs="cg, cgGL"/> </linker> <linker id="linker.cfg.win32.msvc.jogl" extends="linker.cfg.win32.msvc"> @@ -1173,7 +1175,7 @@ </linker> <linker id="linker.cfg.win32.msvc.jogl.cg" extends="linker.cfg.win32.msvc.jogl"> - <syslibset dir="${windows.cg.lib}" libs="cg, cgGL"/> + <syslibset dir="${windows.cg.lib32}" libs="cg, cgGL"/> </linker> <linker id="linker.cfg.macosx.jogl" extends="linker.cfg.macosx"> diff --git a/make/jogl.properties b/make/jogl.properties index 34a593dac..1a123d7dc 100644 --- a/make/jogl.properties +++ b/make/jogl.properties @@ -16,5 +16,7 @@ # default location, modify the appropriate variable to point to the # absolute path of the lib directory # -windows.cg.lib=C:/Cg-2.2/lib -x11.cg.lib=/usr/lib +windows.cg.lib32=C:/Cg-2.2/bin +windows.cg.lib64=C:/Cg-2.2/bin.x64 +x11.cg.lib32=/usr/lib32 +x11.cg.lib64=/usr/lib64 diff --git a/make/scripts/java-win64-dbg.bat b/make/scripts/java-win64-dbg.bat index bed0cee38..5f200127d 100644 --- a/make/scripts/java-win64-dbg.bat +++ b/make/scripts/java-win64-dbg.bat @@ -1,5 +1,5 @@ -set BLD_SUB=build-win32
+set BLD_SUB=build-win64
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
@@ -13,4 +13,4 @@ set CP_ALL=.;%BLD_DIR%\jogl\jogl.all.jar;%BLD_DIR%\nativewindow\nativewindow.all echo CP_ALL %CP_ALL%
-%J2RE_HOME%\bin\java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dnewt.debug=all" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32-dbg.log 2>&1
+%J2RE_HOME%\bin\java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dnewt.debug=all" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win64-dbg.log 2>&1
diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat index 85c7b22af..f0d068b0e 100644 --- a/make/scripts/java-win64.bat +++ b/make/scripts/java-win64.bat @@ -1,5 +1,5 @@ -set BLD_SUB=build-win32
+set BLD_SUB=build-win64
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
@@ -13,4 +13,4 @@ set CP_ALL=.;%BLD_DIR%\jogl\jogl.all.jar;%BLD_DIR%\nativewindow\nativewindow.all echo CP_ALL %CP_ALL%
-%J2RE_HOME%\bin\java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32.log 2>&1
+%J2RE_HOME%\bin\java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win64.log 2>&1
diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat index ee48fd4bf..cea1317a5 100644 --- a/make/scripts/make.jogl.all.win32.bat +++ b/make/scripts/make.jogl.all.win32.bat @@ -14,4 +14,4 @@ REM -DuseKD=true REM -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
REM -Dbuild.noarchives=true
-ant -Dbuild.noarchives=true -Drootrel.build=build-win32 -Djogl.cg=1 -Dwindows.cg.lib=C:\Cg-2.2\lib %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1
+ant -Dbuild.noarchives=true -Drootrel.build=build-win32 -Djogl.cg=1 -Dwindows.cg.lib=C:\Cg-2.2\bin %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1
diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat index 60a3184ef..007f8119f 100644 --- a/make/scripts/make.jogl.all.win64.bat +++ b/make/scripts/make.jogl.all.win64.bat @@ -14,4 +14,4 @@ REM -DuseKD=true REM -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
REM -Dbuild.noarchives=true
-ant -Dbuild.noarchives=true -Drootrel.build=build-win64 -Djogl.cg=1 -Dwindows.cg.lib=C:\Cg-2.2\lib.x64 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win64.log 2>&1
+ant -Dc.compiler.debug=true -Dbuild.noarchives=true -Drootrel.build=build-win64 -Djogl.cg=1 -Dwindows.cg.lib=C:\Cg-2.2\bin.x64 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win64.log 2>&1
|