From 96f7b179b56954546e7fada5a14d2f93d90e2352 Mon Sep 17 00:00:00 2001
From: "iwg..om" <iwgeric@gmail.com>
Date: Wed, 15 May 2013 21:38:49 +0000
Subject: [PATCH] Android: Copy OpenAL Soft library to dist/opt directory when
 building the engine.  Updated OpenAL Soft jar file.

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10614 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 engine/build.xml                              |   4 +
 engine/lib/nblibraries.properties             | 124 +++++++++---------
 .../jME3-openal-soft-natives-android.jar      | Bin 488162 -> 488162 bytes
 .../nbproject/build-openal-soft-natives.xml   |   1 +
 engine/nbproject/project.properties           |   3 +-
 5 files changed, 70 insertions(+), 62 deletions(-)

diff --git a/engine/build.xml b/engine/build.xml
index 806302a7e..26d5caefc 100644
--- a/engine/build.xml
+++ b/engine/build.xml
@@ -234,6 +234,7 @@
 
         <property location="test-data" name="testdata.dir.resolved"/>
         <property location="lib/android/android.jar" name="android.jar.resolved"/>
+        <property location="lib/openal-soft/jME3-openal-soft-natives-android.jar" name="openal-soft.jar.resolved"/>
 
         <pathconvert property="run.classpath.without.build.classes.dir">
             <path path="${run.classpath}"/>
@@ -253,6 +254,7 @@
             <map from="${build.dir.resolved}/lwjgl" to="${build.dir}/jME3-lwjgl.jar"/>
             <map from="${build.dir.resolved}/jogl" to="${build.dir}/jME3-jogl.jar"/>
             <map from="${build.dir.resolved}/android" to=""/>
+            <map from="${build.dir.resolved}/openal-soft" to=""/>
             <map from="${build.dir.resolved}/ios" to=""/>
             <map from="${testdata.dir.resolved}" to="${build.dir.resolved}/jME3-testdata.jar"/>
             <map from="${android.jar.resolved}" to=""/>
@@ -305,6 +307,8 @@
 
         <mkdir dir="${dist.dir}/opt/android"/>
         <copy file="${build.dir}/jME3-android.jar" todir="${dist.dir}/opt/android" overwrite="true"/>
+        <mkdir dir="${dist.dir}/opt/native-openal-soft"/>
+        <copy file="lib/openal-soft/jME3-openal-soft-natives-android.jar" todir="${dist.dir}/opt/native-openal-soft" overwrite="true"/>
         <mkdir dir="${dist.dir}/opt/ios"/>
         <copy file="${build.dir}/jME3-ios.jar" todir="${dist.dir}/opt/ios" overwrite="true"/>
     </target>
diff --git a/engine/lib/nblibraries.properties b/engine/lib/nblibraries.properties
index 743e30c0b..aaf387b6e 100644
--- a/engine/lib/nblibraries.properties
+++ b/engine/lib/nblibraries.properties
@@ -1,61 +1,63 @@
-libs.android.classpath=\
-    ${base}/android/android.jar
-libs.bullet.classpath=\
-    ${base}/bullet/jME3-bullet-natives.jar
-libs.CopyLibs.classpath=\
-    ${base}/CopyLibs-2/org-netbeans-modules-java-j2seproject-copylibstask.jar
-libs.CopyLibs.displayName=CopyLibs Task
-libs.CopyLibs.prop-version=1.0
-libs.jbullet.classpath=\
-    ${base}/jbullet/jbullet.jar:\
-    ${base}/jbullet/stack-alloc.jar:\
-    ${base}/jbullet/vecmath.jar
-libs.jheora.classpath=\
-    ${base}/jheora/jheora-jst-debug-0.6.0.jar
-libs.jme3-test-data.classpath=\
-    ${base}/../test-data/
-libs.jogg.classpath=\
-    ${base}/jogg/j-ogg-oggd.jar:\
-    ${base}/jogg/j-ogg-vorbisd.jar
-libs.jogl.classpath=\
-    ${base}/jogl/gluegen-rt.jar:\
-    ${base}/jogl/jME3-jogl-natives.jar:\
-    ${base}/jogl/jogl.jar
-libs.jogl2.classpath=\
-    ${base}/jogl/gluegen-rt.jar:\
-    ${base}/jogl/joal.jar:\
-    ${base}/jogl/jogl-all.jar
-libs.junit_4.classpath=\
-    ${base}/junit_4/junit-4.5.jar
-libs.junit_4.javadoc=\
-    ${base}/junit_4/junit-4.5-api.zip
-libs.junit_4.src=\
-    ${base}/junit_4/junit-4.5-src.jar
-libs.JWSAntTasks.classpath=\
-    ${base}/JWSAntTasks/org-netbeans-modules-javawebstart-anttasks.jar
-libs.lwjgl.classpath=\
-    ${base}/lwjgl/lwjgl.jar;\
-    ${base}/lwjgl/jME3-lwjgl-natives.jar;\
-    ${base}/lwjgl/jinput.jar
-libs.lwjgl.src=\
-    ${base}/../../Libraries/LWJGL2.7.1/src/
-libs.niftygui1.3.classpath=\
-    ${base}/niftygui/eventbus.jar;\
-    ${base}/niftygui/nifty-default-controls.jar;\
-    ${base}/niftygui/nifty-examples.jar;\
-    ${base}/niftygui/nifty-style-black.jar;\
-    ${base}/niftygui/nifty.jar;\
-    ${base}/niftygui/jglfont-core.jar;\
-    ${base}/niftygui/xmlpull-xpp3.jar
-libs.niftygui1.3.javadoc=\
-    ${base}/niftygui/nifty-default-controls-javadoc.jar!//;\
-    ${base}/niftygui/nifty-examples-javadoc.jar!//
-libs.swing-layout.classpath=\
-    ${base}/swing-layout/swing-layout-1.0.4.jar
-libs.swing-layout.javadoc=\
-    ${base}/swing-layout/swing-layout-1.0.4-doc.zip
-libs.swing-layout.src=\
-    ${base}/swing-layout/swing-layout-1.0.4-src.zip
-libs.noise.classpath=\
-    ${base}/noise/noise-0.0.1-SNAPSHOT.jar
-
+libs.android.classpath=\
+    ${base}/android/android.jar
+libs.bullet.classpath=\
+    ${base}/bullet/jME3-bullet-natives.jar
+libs.CopyLibs.classpath=\
+    ${base}/CopyLibs-2/org-netbeans-modules-java-j2seproject-copylibstask.jar
+libs.CopyLibs.displayName=CopyLibs Task
+libs.CopyLibs.prop-version=1.0
+libs.jbullet.classpath=\
+    ${base}/jbullet/jbullet.jar:\
+    ${base}/jbullet/stack-alloc.jar:\
+    ${base}/jbullet/vecmath.jar
+libs.jheora.classpath=\
+    ${base}/jheora/jheora-jst-debug-0.6.0.jar
+libs.jme3-test-data.classpath=\
+    ${base}/../test-data/
+libs.jogg.classpath=\
+    ${base}/jogg/j-ogg-oggd.jar:\
+    ${base}/jogg/j-ogg-vorbisd.jar
+libs.jogl.classpath=\
+    ${base}/jogl/gluegen-rt.jar:\
+    ${base}/jogl/jME3-jogl-natives.jar:\
+    ${base}/jogl/jogl.jar
+libs.jogl2.classpath=\
+    ${base}/jogl/gluegen-rt.jar:\
+    ${base}/jogl/joal.jar:\
+    ${base}/jogl/jogl-all.jar
+libs.junit_4.classpath=\
+    ${base}/junit_4/junit-4.5.jar
+libs.junit_4.javadoc=\
+    ${base}/junit_4/junit-4.5-api.zip
+libs.junit_4.src=\
+    ${base}/junit_4/junit-4.5-src.jar
+libs.JWSAntTasks.classpath=\
+    ${base}/JWSAntTasks/org-netbeans-modules-javawebstart-anttasks.jar
+libs.lwjgl.classpath=\
+    ${base}/lwjgl/lwjgl.jar;\
+    ${base}/lwjgl/jME3-lwjgl-natives.jar;\
+    ${base}/lwjgl/jinput.jar
+libs.lwjgl.src=\
+    ${base}/../../Libraries/LWJGL2.7.1/src/
+libs.niftygui1.3.classpath=\
+    ${base}/niftygui/eventbus.jar;\
+    ${base}/niftygui/nifty-default-controls.jar;\
+    ${base}/niftygui/nifty-examples.jar;\
+    ${base}/niftygui/nifty-style-black.jar;\
+    ${base}/niftygui/nifty.jar;\
+    ${base}/niftygui/jglfont-core.jar;\
+    ${base}/niftygui/xmlpull-xpp3.jar
+libs.niftygui1.3.javadoc=\
+    ${base}/niftygui/nifty-default-controls-javadoc.jar!//;\
+    ${base}/niftygui/nifty-examples-javadoc.jar!//
+libs.openalsoft.classpath=\
+    ${base}/openal-soft/jME3-openal-soft-natives-android.jar
+libs.swing-layout.classpath=\
+    ${base}/swing-layout/swing-layout-1.0.4.jar
+libs.swing-layout.javadoc=\
+    ${base}/swing-layout/swing-layout-1.0.4-doc.zip
+libs.swing-layout.src=\
+    ${base}/swing-layout/swing-layout-1.0.4-src.zip
+libs.noise.classpath=\
+    ${base}/noise/noise-0.0.1-SNAPSHOT.jar
+
diff --git a/engine/lib/openal-soft/jME3-openal-soft-natives-android.jar b/engine/lib/openal-soft/jME3-openal-soft-natives-android.jar
index 02880883c9cd252c85835079fcde73b18d72e366..ee4dec907183078688549ee8b9a0e37628d8cebf 100644
GIT binary patch
delta 79
zcmaF#RQAzR*$FjF%IS@Dt#yoB>zHiIfSmTdWlTWKynSyOi&-N`;Olo5AZFeE^*b9!
Y6;NRM|3Y?e5baaM?hc}-7P0#R095ZFE&u=k

delta 79
zcmaF#RQAzR*$FjFR&kAWt#yoB>zHiIfSmTdWlTWKynSyOi&-N`;Olo5AZFeE^*b9!
Y6;NRM|3Y?e5baaM?hc}-7P0#R0ARf!f&c&j

diff --git a/engine/nbproject/build-openal-soft-natives.xml b/engine/nbproject/build-openal-soft-natives.xml
index 802c32785..573e6057c 100644
--- a/engine/nbproject/build-openal-soft-natives.xml
+++ b/engine/nbproject/build-openal-soft-natives.xml
@@ -75,6 +75,7 @@
         <copy todir="${openal-soft.build.dir}/jni" verbose="true" flatten="false" overwrite="true">
             <fileset dir="${openal-soft.source.dir}">
                 <include name="*.*" />
+                <!--<include name="**/*.*"/>-->
             </fileset>
         </copy>
 <!--
diff --git a/engine/nbproject/project.properties b/engine/nbproject/project.properties
index b3eb54f1d..65d71ebca 100644
--- a/engine/nbproject/project.properties
+++ b/engine/nbproject/project.properties
@@ -41,7 +41,8 @@ javac.classpath=\
     ${libs.jme3-test-data.classpath}:\
     ${libs.android.classpath}:\
     ${libs.bullet.classpath}:\
-    ${libs.jogl2.classpath}
+    ${libs.jogl2.classpath}:\
+    ${libs.openalsoft.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false