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/build.xml | |
| 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/build.xml')
| -rw-r--r-- | make/build.xml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/make/build.xml b/make/build.xml index 791e69aed..8d6d459b5 100644 --- a/make/build.xml +++ b/make/build.xml @@ -195,10 +195,12 @@ <mkdir dir="${build}/android/lib" /> <javac destdir="${build}/android/classes" includes="com/jogamp/android/launcher/**" - source="${target.sourcelevel}" fork="yes" includeAntRuntime="false" memoryMaximumSize="${javac.memorymax}" + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${project.root}/src/android" /> <classpath location="${android.jar}"/> @@ -418,7 +420,7 @@ overview="${javadoc.overview}" access="public" source="${target.sourcelevel}" - maxmemory="1024m" + maxmemory="${javac.memorymax}" bottom="${javadoc.bottom}" > <classpath refid="jogl_all.classpath"/> <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" /> @@ -439,7 +441,7 @@ overview="${javadoc.overview}" access="public" source="${target.sourcelevel}" - maxmemory="1024m" + maxmemory="${javac.memorymax}" bottom="${javadoc.bottom}" > <classpath refid="jogl_all.classpath"/> <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" /> @@ -461,7 +463,7 @@ overview="${javadoc.overview}" access="protected" source="${target.sourcelevel}" - maxmemory="1024m" + maxmemory="${javac.memorymax}" bottom="${javadoc.bottom}" > <classpath refid="jogl_all.classpath"/> <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" /> @@ -482,7 +484,7 @@ overview="${javadoc.nw.overview}" access="public" source="${target.sourcelevel}" - maxmemory="1024m" + maxmemory="${javac.memorymax}" bottom="${javadoc.bottom}" > <classpath refid="jogl_all.classpath"/> <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" /> |