diff options
| author | Sven Gothel <[email protected]> | 2013-02-17 18:22:33 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-02-17 18:22:33 +0100 |
| commit | e4fc97f6c08d58d1a62543fdfda92fddfda6ee68 (patch) | |
| tree | d15290a5aad0dea534684d6b8d1dd51c9208c363 /make/jogamp-env.xml | |
| parent | 4aa36ed61fd1bb434f2a5dd4d7dbffd6f87a446d (diff) | |
OSX/Java7 darwin/jawt_md.h Workaround ; Disable OSX/i386 if compiled w/ Java7 [1.7 - 2.0]; Valid Java range [1.6 - 2.0].
- OSX/Java7 darwin/jawt_md.h Workaround
Include JOGL's JNI MacOSX platform headers, since Oracle's Java7 darwin/jawt_md.h
has X11 dependencies and does not define JAWT_SurfaceLayers.
- Disable OSX/i386 if compiled w/ Java7 [1.7 - 2.0]
Set macosx32 depending on 'ant.java.version'
- Valid Java range [1.6 - 2.0]
Foresee new Java versions 1.9 and 2.0 :)
Diffstat (limited to 'make/jogamp-env.xml')
| -rwxr-xr-x | make/jogamp-env.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml index f02901e..d6ff239 100755 --- a/make/jogamp-env.xml +++ b/make/jogamp-env.xml @@ -42,6 +42,8 @@ <contains string="${ant.java.version}" substring="1.6" casesensitive="false" /> <contains string="${ant.java.version}" substring="1.7" casesensitive="false" /> <contains string="${ant.java.version}" substring="1.8" casesensitive="false" /> + <contains string="${ant.java.version}" substring="1.9" casesensitive="false" /> + <contains string="${ant.java.version}" substring="2.0" casesensitive="false" /> </or> </not> </condition> |