From d19cd1049d55f93580c37f6a9599f7583e160258 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 22 Jan 2012 19:42:23 +0100
Subject: 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()'
---
 make/build-staticglgen.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'make/build-staticglgen.xml')

diff --git a/make/build-staticglgen.xml b/make/build-staticglgen.xml
index 325b737bb..ea19bc6d2 100644
--- a/make/build-staticglgen.xml
+++ b/make/build-staticglgen.xml
@@ -30,7 +30,11 @@
 
         <!-- Compile BuildStaticGLInfo -->
         <javac srcdir="${src.java}" destdir="${classes}" includes="**/BuildStaticGLInfo.java" source="${target.sourcelevel}" debug="true" debuglevel="${javacdebuglevel}"
-               includeAntRuntime="false">
+               includeAntRuntime="false"
+               memoryMaximumSize="${javac.memorymax}"
+               source="${target.sourcelevel}" 
+               target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}">
             <classpath refid="antlr.classpath" />
         </javac>
         
@@ -51,7 +55,9 @@
            - NOTE:  ONLY the StaticGLGen is built at this time.  BuildStaticGLInfo 
            -        itself is built in a separate task.  -->
         <javac destdir="${classes}" includes="**/StaticGLGenTask.java" source="${target.sourcelevel}" debug="true" debuglevel="${javacdebuglevel}"
-               includeAntRuntime="false">
+               includeAntRuntime="true"
+               memoryMaximumSize="${javac.memorymax}"
+               source="1.6">
             <src path="${src.java}" />
             <classpath refid="classpath" />
         </javac>
-- 
cgit v1.2.3