diff options
| author | Michael Bien <[email protected]> | 2010-07-18 02:44:42 +0200 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2010-07-18 02:44:42 +0200 |
| commit | 5c67883ba47c8510e5826e38fb09333245e10335 (patch) | |
| tree | ab0fefda9dc974499d910b555c26b4c224c0eaba /make | |
| parent | 6c14437ff4ffdefbce3d61aacc3d1389fec47a69 (diff) | |
| parent | 1fc1b32e67c125590bf04e766ee7eb54a6f48b83 (diff) | |
Merge branch 'master' of http://github.com/sgothel/jogl
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-jogl.xml | 4 | ||||
| -rwxr-xr-x | make/scripts/java-run-all.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index cc86e0a34..da6dacdc8 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1163,8 +1163,8 @@ <linker id="linker.cfg.macosx.jogl" extends="linker.cfg.macosx"> <linkerarg value="-framework" /> <linkerarg value="Cocoa" /> - <!--linkerarg value="-framework" /> - <linkerarg value="OpenGL" /--> + <linkerarg value="-framework" /> + <linkerarg value="OpenGL" /> </linker> <!--linker id="linker.cfg.macosx.jogl.cg" extends="linker.cfg.macosx.jogl"> diff --git a/make/scripts/java-run-all.sh b/make/scripts/java-run-all.sh index 0188ae5d2..f99a49617 100755 --- a/make/scripts/java-run-all.sh +++ b/make/scripts/java-run-all.sh @@ -44,7 +44,7 @@ uname -a | grep -i Darwin && MOSX=1 # D_ARGS="-Dnewt.debug=all -Dnativewindow.debug=all" # D_ARGS="-Djogl.debug=all -Dnewt.debug=all -Dnativewindow.debug=all" # D_ARGS="-Dnewt.debug=all" -# D_ARGS="-Dnewt.debug.Window" +D_ARGS="-Dnewt.debug.Window" # D_ARGS="-Dnewt.debug.Display" # D_ARGS="-Djogl.debug=all -Djogl.debug.DynamicLookup=true -Djogamp.debug.NativeLibrary=true" # D_ARGS="-Djogl.debug=all" |