summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkbr <[email protected]>2006-08-27 09:18:26 +0000
committerkbr <[email protected]>2006-08-27 09:18:26 +0000
commit01354da790d0da8c8aed98fab02967f5f856e84a (patch)
tree48f42150084f13a5d79bf4c17445f44cc8a13ea4
parentab1d8906991beca3829f2a26ef1e12b0e3f5ee6b (diff)
Added building of native library jar files to normal build target,
including bundling of OpenAL implementations on Windows and Linux platforms; still need to remove this from the dist target git-svn-id: file:///home/mbien/NetBeansProjects/JOGAMP/joal-sync/git-svn/../svn-server-sync/joal/trunk@270 03bf7f67-59de-4072-a415-9a990d468a3f
-rwxr-xr-xmake/build.xml19
-rwxr-xr-xmake/lib/linux-i586/libopenal.sobin0 -> 758109 bytes
-rwxr-xr-xmake/lib/windows-i586/OpenAL32.dllbin0 -> 73728 bytes
-rwxr-xr-xmake/lib/windows-i586/wrap_oal.dllbin0 -> 409600 bytes
4 files changed, 18 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml
index 99d2802..2287943 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -289,7 +289,15 @@
<property name="linker.cfg.id.core" value="linker.cfg.solaris.amd64" />
</target>
- <target name="declare.macosx" if="isOSX">
+ <target name="declare.macosx.ppc" if="isOSXPPC">
+ <echo message="MacOSX PPC" />
+ </target>
+
+ <target name="declare.macosx.universal" if="isOSXUniversal">
+ <echo message="MacOSX Universal" />
+ </target>
+
+ <target name="declare.macosx" if="isOSX" depends="declare.macosx.ppc,declare.macosx.universal">
<echo message="MacOSX" />
<property name="java.includes.dir.platform" value="${java.includes.dir.macosx}" />
@@ -522,6 +530,15 @@
</antcall>
<antcall target="c.rename.joal.lib.mingw" inheritRefs="true" />
<antcall target="c.rename.joal.lib.macosx" inheritRefs="true" />
+ <!-- Create Java Web Start jar file from built file -->
+ <jar destfile="../build/joal-natives-${os.and.arch}.jar">
+ <fileset dir="../build/obj">
+ <include name="*joal_native.${native.library.suffix}" />
+ </fileset>
+ <fileset dir="lib/${os.and.arch}">
+ <include name="*.${native.library.suffix}" />
+ </fileset>
+ </jar>
</target>
<!-- ================================================================== -->
diff --git a/make/lib/linux-i586/libopenal.so b/make/lib/linux-i586/libopenal.so
new file mode 100755
index 0000000..ebcaee5
--- /dev/null
+++ b/make/lib/linux-i586/libopenal.so
Binary files differ
diff --git a/make/lib/windows-i586/OpenAL32.dll b/make/lib/windows-i586/OpenAL32.dll
new file mode 100755
index 0000000..a2e77f2
--- /dev/null
+++ b/make/lib/windows-i586/OpenAL32.dll
Binary files differ
diff --git a/make/lib/windows-i586/wrap_oal.dll b/make/lib/windows-i586/wrap_oal.dll
new file mode 100755
index 0000000..22697eb
--- /dev/null
+++ b/make/lib/windows-i586/wrap_oal.dll
Binary files differ