diff options
| author | Sven Gothel <[email protected]> | 2011-10-21 17:05:31 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-10-21 17:05:31 +0200 |
| commit | 929093c88a8741ee4819291c4494f350695a394c (patch) | |
| tree | d9d38305d70aad4284da63d032d7055bb325a653 /make | |
| parent | 742f11b06bece2679cb3bd8ec3ded885dfb0363b (diff) | |
Cleanup JARs: Add jogl_cg native jar (atomic only); Move newt.event.jar to atomic.
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 2 | ||||
| -rw-r--r-- | make/build-jogl.xml | 25 |
2 files changed, 18 insertions, 9 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index aceece32d..51450a664 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -351,6 +351,7 @@ <property name="newt.core.jar" value="${build.newt}/newt.core.jar" /> <property name="newt.ogl.jar" value="${build.newt}/newt.ogl.jar" /> <property name="newt.awt.jar" value="${build.newt}/newt.awt.jar" /> + <property name="newt.event.jar" value="${build.newt}/newt.event.jar" /> <!-- using NEWT events w/o NEWT --> <property name="newt.driver.x11.jar" value="${build.newt}/newt.driver.x11.jar" /> <property name="newt.driver.win.jar" value="${build.newt}/newt.driver.win.jar" /> <property name="newt.driver.macosx.jar" value="${build.newt}/newt.driver.macosx.jar" /> @@ -391,7 +392,6 @@ <!-- JavaSE combinations . AWT --> <property name="jogl.all.jar" value="${jar}/jogl.all.jar" /> - <property name="newt.event.jar" value="${jar}/newt.event.jar" /> <!-- JavaSE combinations . NO.AWT --> <property name="jogl.all-noawt.jar" value="${jar}/jogl.all-noawt.jar" /> diff --git a/make/build-jogl.xml b/make/build-jogl.xml index a8d75501b..58e018024 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -65,19 +65,23 @@ <classpath> <pathelement location="${ant-contrib.jar}"/> </classpath> </taskdef> - <condition property="setup.addNativeNVidiaCG"> - <or> - <isset property="${isWindows}" /> - <isset property="${isOSX}" /> - <isset property="${isX11}" /> - </or> - </condition> - <!-- ================================================================== --> <!-- - Base initialization and detection of operating system. --> <target name="partitioning.setup" depends="common.init"> + <echo message="isX11 : ${isX11}" /> + <condition property="setup.addNativeNVidiaCG"> + <or> + <isset property="isWindows" /> + <isset property="isOSX" /> + <isset property="isX11" /> + </or> + </condition> + <echo message="setup.noNativeDesktop : ${setup.noNativeDesktop}" /> + <echo message="setup.addNativeOpenMAX : ${setup.addNativeOpenMAX}" /> + <echo message="setup.addNativeNVidiaCG: ${setup.addNativeNVidiaCG}" /> + <property name="java.part.gluegen-gl" value="com/jogamp/gluegen/opengl/** com/jogamp/gluegen/runtime/opengl/*"/> @@ -1563,6 +1567,11 @@ <exclude name="*jogl_cg.${native.library.suffix}" /> </fileset> </jar> + <jar manifest="${build.jogl}/manifest.mf" destfile="${build.jogl}/jogl_cg-natives-${os.and.arch}.jar" filesonly="true"> + <fileset dir="${obj.jogl}"> + <include name="*jogl_cg.${native.library.suffix}" /> + </fileset> + </jar> </target> <!-- ================================================================== --> |