diff options
| author | Sven Gothel <[email protected]> | 2010-04-28 14:27:47 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-04-28 14:27:47 +0200 |
| commit | 14256647c8954bb8d6d2afa88927e75783bc912b (patch) | |
| tree | 54b2eb74000f410ade6d55e4739088d3df281f38 /make/build-jogl.xml | |
| parent | 3dfb97a57bf1116c44709c50cbb9d0628967fd52 (diff) | |
- JAR Manifest: Trusted-Library: true
- Added JAR Manifest to native libs as well,
otherwise our chain would become mixed code.
- JNLP: Set JogAmp community as vendor ..
- JOGL Windows hack: WindowsWGLContext.java
- temporary removed the ARB CreateContext path
for Windows, due to a bug in this implementation.
Diffstat (limited to 'make/build-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 760200398..a101f5ecb 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1485,26 +1485,13 @@ </antcall> <antcall target="c.manifest" inheritRefs="true" /> - <!-- Create the Java Web Start jar file for the built native code --> - <jar destfile="${build.jogl}/jogl-natives-${os.and.arch}.jar" filesonly="true"> - <fileset dir="${obj.jogl}"> - <include name="*.${native.library.suffix}" /> - </fileset> - </jar> - <jar destfile="${build.jogl}/jogl-natives-${os.and.arch}-cdc.jar" filesonly="true"> - <fileset dir="${obj.jogl}"> - <include name="*_es1.${native.library.suffix-cdc}" /> - <include name="*_es2.${native.library.suffix-cdc}" /> - <include name="*_gl2es12.${native.library.suffix-cdc}" /> - </fileset> - </jar> </target> <!-- ================================================================== --> <!-- - Build the jogl.jar files. --> - <target name="jar" depends="java.compile,build-jars-javase,build-jars-cdc"/> + <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" /> <target name="setup-manifestfile"> <condition property="manifestfile" value="joglRIversion"> @@ -1717,6 +1704,13 @@ <fileset dir="${src.java}" includes="${java.part.util.fixedfuncemu.shadercode}"/> </jar> + <jar manifest="${build.jogl}/tempversion-cdc" destfile="${build.jogl}/jogl-natives-${os.and.arch}-cdc.jar" filesonly="true"> + <fileset dir="${obj.jogl}"> + <include name="*_es1.${native.library.suffix-cdc}" /> + <include name="*_es2.${native.library.suffix-cdc}" /> + <include name="*_gl2es12.${native.library.suffix-cdc}" /> + </fileset> + </jar> </target> <target name="build-jars-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase" unless="setup.nodesktop"> @@ -1776,6 +1770,11 @@ <fileset dir="${src.java}" includes="${java.part.util.fixedfuncemu.shadercode}"/> </jar> + <jar manifest="${build.jogl}/tempversion" destfile="${build.jogl}/jogl-natives-${os.and.arch}.jar" filesonly="true"> + <fileset dir="${obj.jogl}"> + <include name="*.${native.library.suffix}" /> + </fileset> + </jar> </target> <!-- ================================================================== --> @@ -1910,7 +1909,7 @@ <!-- - Build everything. --> - <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="init,jar,c.build.jogl,generate.version.txt" /> + <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="init,java.compile,c.build.jogl,build-jars,generate.version.txt" /> <target name="generate.version.txt" depends="init"> <!-- Create a version.txt file indicating which version we just built --> |