diff options
| author | Sven Gothel <[email protected]> | 2012-01-22 19:42:23 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-01-22 19:42:23 +0100 |
| commit | d19cd1049d55f93580c37f6a9599f7583e160258 (patch) | |
| tree | 9c53ac69137744222bc2883c220595eedf0fda49 /make/scripts | |
| parent | 4635eb9f78456f14376ae524c8aee74019f770c5 (diff) | |
Fix Bug 516 (Determine Java Version) / Fix OS X 10.5 linkage (weak framework, NEWT)
- Fix Bug 516 (Determine Java Version).
See gluegen: 64639b805a32338385421f168e12c1ef7f749d00
- Fix OS X 10.5 linkage (weak framework, NEWT)
- Use weak framework linkage for all modules and frameworks:
AppKit, QuartzCore, Cocoa, OpenGL, JavaNativeFoundation
- NEWT: Handle NS exception while calling OS X >= 10.6 only methods:
- 'setAllowsConcurrentViewDrawing()'
- 'setCanDrawConcurrently()'
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/make.jogl.all.linux-x86_64.sh | 8 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.macosx.sh | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh index 6fe80312b..4642326d5 100755 --- a/make/scripts/make.jogl.all.linux-x86_64.sh +++ b/make/scripts/make.jogl.all.linux-x86_64.sh @@ -24,6 +24,11 @@ fi # -DisLinux=true \ # -DisLinuxAMD64=true \ # -DisX11=true \ +# +# -Dtarget.sourcelevel=1.6 \ +# -Dtarget.targetlevel=1.6 \ +# -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ + #LD_LIBRARY_PATH=/opt-linux-x86_64/mesa-7.8.1/lib64 #export LD_LIBRARY_PATH @@ -44,6 +49,9 @@ echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF # BUILD_ARCHIVE=true \ ant \ $CUSTOMLIBDIR \ + -Dtarget.sourcelevel=1.6 \ + -Dtarget.targetlevel=1.6 \ + -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -Djavacdebuglevel="source,lines,vars" \ -Drootrel.build=build-x86_64 \ -Dsetup.addNativeOpenMAX=true \ diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh index 1c22efe48..23a276c72 100755 --- a/make/scripts/make.jogl.all.macosx.sh +++ b/make/scripts/make.jogl.all.macosx.sh @@ -8,7 +8,15 @@ fi # -Dc.compiler.debug=true \ # -Djavacdebug="true" \ # -Djavacdebuglevel="source,lines,vars" \ +# +# -Dtarget.sourcelevel=1.6 \ +# -Dtarget.targetlevel=1.6 \ +# -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ + ant \ + -Dtarget.sourcelevel=1.6 \ + -Dtarget.targetlevel=1.6 \ + -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -Drootrel.build=build-macosx \ $* 2>&1 | tee make.jogl.all.macosx.log |