diff options
Diffstat (limited to 'make/build-nativewindow.xml')
| -rw-r--r-- | make/build-nativewindow.xml | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index b3a02b9b9..d13ca09b8 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -67,7 +67,7 @@ <!-- partitioning --> <property name="java.part.core" - value="com/jogamp/nativewindow/* com/jogamp/nativewindow/util/* com/jogamp/nativewindow/egl/* com/jogamp/nativewindow/swt/** jogamp/nativewindow/*"/> + value="com/jogamp/nativewindow/* com/jogamp/nativewindow/util/* com/jogamp/nativewindow/egl/* com/jogamp/nativewindow/swt/** com/jogamp/nativewindow/javafx/** jogamp/nativewindow/*"/> <property name="java.part.awt" value="com/jogamp/nativewindow/awt/* jogamp/nativewindow/jawt/** jogamp/nativewindow/**/awt/**"/> @@ -227,7 +227,7 @@ outputRootDir="${build.nativewindow}" config="${windowlib.os.cfg}" includeRefid="stub.includes.fileset.platform" - literalInclude="${stub.includes.gluegen.gg}, ${src.c}/${window.os.system}" + literalInclude="${stub.includes.gluegen.gg}, ${stub.includes}/${window.os.system}/gluegen, ${src.c}/${window.os.system}" emitter="com.jogamp.gluegen.JavaEmitter" debug="false" dumpCPP="false"> @@ -246,7 +246,7 @@ outputRootDir="${build.nativewindow}" config="${jawt.cfg}" includeRefid="stub.includes.fileset.platform" - literalInclude="${stub.includes.gluegen.gg}, ${stub.includes.gluegen}/jni, ${stub.includes.gluegen}/jni/${jni.platform.sub}" + literalInclude="${stub.includes.gluegen.gg}, ${stub.includes.gluegen}/jni, ${stub.includes.gluegen}/jni/${jni.platform.sub}, ${stub.includes}/${window.os.system}/gluegen" emitter="com.jogamp.gluegen.JavaEmitter" debug="false" dumpCPP="false"> @@ -404,15 +404,15 @@ </linker> <linker id="linker.cfg.linux.armv6.nativewindow.x11" extends="linker.cfg.linux.armv6"> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" /> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xxf86vm" /> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="X11" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="Xxf86vm" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="Xrender" /> </linker> <linker id="linker.cfg.linux.aarch64.nativewindow.x11" extends="linker.cfg.linux.aarch64"> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" /> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xxf86vm" /> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="X11" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="Xxf86vm" /> + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="Xrender" /> </linker> <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris"> @@ -616,10 +616,6 @@ <move file="${src}" tofile="${dest}" /> </target> - <target name="rename.dylib" if="isOSX"> - <move file="${src}" tofile="${dest}" /> - </target> - <macrodef name="c.build"> <attribute name="c.compiler.src.files" /> <attribute name="compiler.cfg.id" /> @@ -688,7 +684,7 @@ <targetfiles> <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.so"/> <fileset dir="${obj.nativewindow}" includes="@{output.lib.name}.dll"/> - <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.jnilib"/> + <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.dylib"/> </targetfiles> <sequential> <cc outtype="shared" @@ -710,6 +706,7 @@ <includepath path="${src.generated.c}" /> <includepath path="${src.generated.c}/X11" if="isX11"/> <includepath path="${src.generated.c}/MacOSX" if="isOSX"/> + <includepath path="stub_includes/win32" if="isWindows"/> <includepath path="${src.generated.c}/Windows" if="isWindows"/> <includepath path="${src.c}/x11" if="isX11"/> <includepath path="${src.c}/macosx" if="isOSX"/> @@ -727,14 +724,7 @@ </cc> <!-- FIXME: this is a hack; the cpptask should have an option to change the - suffix or at least understand the override from dylib to jnilib --> - <antcall target="rename.dylib" inheritRefs="true"> - <param name="src" value="${obj.nativewindow}/lib@{output.lib.name}.dylib" /> - <param name="dest" value="${obj.nativewindow}/lib@{output.lib.name}.jnilib" /> - </antcall> - - <!-- FIXME: this is a hack; the cpptask should have an option to change the - suffix or at least understand the override from dylib to jnilib --> + suffix or at least understand the override from so to dll --> <antcall target="rename.mingw.dll" inheritRefs="true"> <param name="src" value="${obj.nativewindow}/lib@{output.lib.name}.so" /> <param name="dest" value="${obj.nativewindow}/@{output.lib.name}.dll" /> |