summaryrefslogtreecommitdiffstats
path: root/make/build.xml
diff options
context:
space:
mode:
authorsg215889 <[email protected]>2009-07-15 05:47:43 -0700
committersg215889 <[email protected]>2009-07-15 05:47:43 -0700
commitf2801bf69ba572d9e030e3fbf920342c29704d3a (patch)
tree183c74d095ca3e7527eb01db2dfc54b5fe3f0e47 /make/build.xml
parenteb2b1011393c9b2ed0d3f8dd15979a5fbdfc2ce9 (diff)
Build CDC named JARs for CVM in default build, no more specialized build necessary.
Diffstat (limited to 'make/build.xml')
-rw-r--r--make/build.xml11
1 files changed, 5 insertions, 6 deletions
diff --git a/make/build.xml b/make/build.xml
index a3f0530d1..3e7c74c53 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -113,16 +113,15 @@
</filterset>
</copy>
<mkdir dir="${archive.dir}/lib" />
- <copy file="${project.root}/../gluegen/${rootrel.build}/gluegen-rt.jar" todir="${archive.dir}/lib" />
<copy todir="${archive.dir}/lib">
- <fileset dir="${project.root}/../gluegen/${rootrel.build}" includes="gluegen-rt.jar" />
- <fileset dir="${project.root}/../gluegen/${rootrel.build}/obj" includes="*.${native.library.suffix}" />
+ <fileset dir="${project.root}/../gluegen/${rootrel.build}" includes="gluegen-rt.jar gluegen-rt-cdc.jar" />
+ <fileset dir="${project.root}/../gluegen/${rootrel.build}/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
<fileset dir="${build}/jogl" includes="*.jar" excludes="*natives*.jar" />
- <fileset dir="${build}/jogl/obj" includes="*.${native.library.suffix}" />
+ <fileset dir="${build}/jogl/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
<fileset dir="${build}/nativewindow" includes="*.jar" excludes="*natives*.jar" />
- <fileset dir="${build}/nativewindow/obj" includes="*.${native.library.suffix}" />
+ <fileset dir="${build}/nativewindow/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
<fileset dir="${build}/newt" includes="*.jar" excludes="*natives*.jar" />
- <fileset dir="${build}/newt/obj" includes="*.${native.library.suffix}" />
+ <fileset dir="${build}/newt/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
</copy>
<mkdir dir="${archive.dir}/etc" />
<copy todir="${archive.dir}/etc">