diff options
| author | Kenneth Russel <[email protected]> | 2005-07-07 22:49:47 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2005-07-07 22:49:47 +0000 |
| commit | 0fa2740c8c186b0908baa5b7629bef657fe38527 (patch) | |
| tree | a6f15a7e18af660886149730c2d677a537bf38c5 /make/build.xml | |
| parent | 0969a98f2007d76e38f8819eedfead5b840f6364 (diff) | |
Merged with main trunk (tag JOGL_PRE_1_1_1)
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@317 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/make/build.xml b/make/build.xml index 604c33849..f707e43d7 100644 --- a/make/build.xml +++ b/make/build.xml @@ -176,7 +176,7 @@ <include name="${stub.includes.dir}/x11/**" /> <include name="${stub.includes.dir}/common/**" /> <include name="*.cfg" /> - <include name="*.java" /> + <include name="gl*.java" /> <include name="*.c" /> <exclude name="cg-common.cfg" /> </fileset> @@ -191,6 +191,7 @@ <fileset id="stub.includes.cg.dependencies.fileset" dir="."> <include name="${stub.includes.dir}/cg/**" /> <include name="cg-common.cfg" /> + <include name="cg-common-CustomJavaCode.java" /> </fileset> <property name="java.includes.dir" value="${java.home.dir}/include" /> <!-- NOTE: this MUST be relative for FileSet --> @@ -1013,11 +1014,9 @@ <jar destfile="${jogl.dist.dir}/jogl-natives-solsparc.jar" basedir="${jogl.dist.dir}/jogl-solsparc" includes="libjogl.so" /> - <!-- Note: Solaris/x86 elided for now as it requires Mesa to - be installed --> - <!-- jar destfile="${jogl.dist.dir}/jogl-natives-solx86.jar" + <jar destfile="${jogl.dist.dir}/jogl-natives-solx86.jar" basedir="${jogl.dist.dir}/jogl-solx86" - includes="libjogl.so" --> + includes="libjogl.so" /> <!-- Build a source archive as well --> <zip destfile="${jogl.dist.dir}/jogl-src.zip" basedir="../.." |