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-nativewindow.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-nativewindow.xml')
| -rw-r--r-- | make/build-nativewindow.xml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 1b28a5d92..336ab0277 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -315,10 +315,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}"> <classpath refid="swt_gluegen.classpath"/> <src path="${src.java}" /> @@ -453,10 +455,12 @@ <linker id="linker.cfg.macosx.nativewindow" extends="linker.cfg.macosx"> <linkerarg value="-weak_framework" /> + <linkerarg value="AppKit" /> + <linkerarg value="-weak_framework" /> <linkerarg value="QuartzCore" /> <linkerarg value="-weak_framework" /> <linkerarg value="Cocoa" /> - <linkerarg value="-framework" /> + <linkerarg value="-weak_framework" /> <linkerarg value="JavaNativeFoundation" /> <linkerarg value="-F${java.osx.frameworks.dir}" /> </linker> @@ -886,6 +890,7 @@ destdir="${javadoc}" windowtitle="${javadoc.windowtitle}" overview="${javadoc.overview}" source="${target.sourcelevel}" + maxmemory="${javac.memorymax}" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > </javadoc> @@ -900,6 +905,7 @@ destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}" overview="${javadoc.overview}" source="${target.sourcelevel}" + maxmemory="${javac.memorymax}" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > </javadoc> @@ -914,6 +920,7 @@ destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}" overview="${javadoc.overview}" source="${target.sourcelevel}" + maxmemory="${javac.memorymax}" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > </javadoc> |