diff options
| author | Sven Gothel <[email protected]> | 2013-02-17 18:55:18 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-02-17 18:55:18 +0100 |
| commit | fdc20a0205bb01747055910eb2bb33202edee277 (patch) | |
| tree | 578b57a56c76f01bd6b1b9e2df8a78270ae0b176 /make/build-nativewindow.xml | |
| parent | f937a727354fc24321d40df95008d569972ed169 (diff) | |
OSX/Java7 Cleanup: Remove JavaNativeFoundation dependency; NativeWindow-JAWT: Remove c.fixup.jawt.version.macosx (redundant, libjawt.dylib is rpath'ed always)
Diffstat (limited to 'make/build-nativewindow.xml')
| -rw-r--r-- | make/build-nativewindow.xml | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 3c97d9d9b..a8408eaa7 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -361,7 +361,6 @@ </compiler> <compiler id="compiler.cfg.macosx.nativewindow" extends="compiler.cfg.macosx"> - <compilerarg value="-I${java.osx.frameworks.dir}/JavaNativeFoundation.framework/Headers" /> </compiler> <!-- linker configuration --> @@ -446,9 +445,6 @@ <linkerarg value="QuartzCore" /> <linkerarg value="-weak_framework" /> <linkerarg value="Cocoa" /> - <linkerarg value="-weak_framework" /> - <linkerarg value="JavaNativeFoundation" /> - <linkerarg value="-F${java.osx.frameworks.dir}" /> </linker> <linker id="linker.cfg.hpux.nativewindow" extends="linker.cfg.hpux"> @@ -735,20 +731,6 @@ </sequential> </macrodef> - <target name="c.fixup.jawt.version.macosx" if="isOSX" unless="setup.noNativeAWT"> - <!-- Edit the link to the JAWT version in the resulting jnilib - file; this isn't strictly needed but seems to allow the - universal binaries to work on 10.3 machines as well, which - is desirable for some end users --> - <apply executable="install_name_tool"> - <arg value="-change" /> - <arg value="/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Libraries/libjawt.dylib" /> - <arg value="/System/Library/Frameworks/JavaVM.framework/Libraries/libjawt.dylib" /> - <srcfile /> - <fileset dir="${obj.nativewindow}" includes="libnativewindow_awt.jnilib" /> - </apply> - </target> - <target name="c.build.nativewindow.awt" unless="setup.noNativeAWT"> <c.build c.compiler.src.files="c.src.files.awt" c.compiler.use-jawt="true" @@ -796,7 +778,6 @@ </target> <target name="c.build.nativewindow" depends="c.configure,c.build.nativewindow.windowlib,c.build.nativewindow.awt"> - <antcall target="c.fixup.jawt.version.macosx" inheritrefs="true" /> <antcall target="c.manifest" inheritRefs="true" /> </target> |