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-newt.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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

diff --git a/make/build-newt.xml b/make/build-newt.xml
index c812d98f3..34ea50e6b 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -206,10 +206,12 @@
         <!-- Perform the second pass Java compile; everything. -->
         <javac destdir="${classes}"
                excludes="${java.excludes.all}"
-               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="${src.java}" />
             <classpath refid="jogl_nativewindow_gluegen.classpath"/>
@@ -311,6 +313,8 @@
       </linker>
 
       <linker id="linker.cfg.macosx.newt" extends="linker.cfg.macosx">
+        <linkerarg value="-weak_framework" />
+        <linkerarg value="AppKit" />
         <linkerarg value="-weak_framework" />
         <linkerarg value="Cocoa" />
       </linker>
@@ -763,6 +767,7 @@
                  destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}"
                  source="${target.sourcelevel}"
+                 maxmemory="${javac.memorymax}"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
          <classpath refid="jogl_nativewindow_gluegen.classpath"/>
@@ -777,6 +782,7 @@
                  destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}"
                  source="${target.sourcelevel}"
+                 maxmemory="${javac.memorymax}"
                  linkoffline="${javadoc.link} 142-packages"
                  bottom="${javadoc.bottom}" >
          <classpath refid="jogl_nativewindow_gluegen.classpath"/>
@@ -791,6 +797,7 @@
                  destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}"
                  source="${target.sourcelevel}"
+                 maxmemory="${javac.memorymax}"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
          <classpath refid="jogl_nativewindow_gluegen.classpath"/>
-- 
cgit v1.2.3