fixed ios backend dependencies and gdx-audio build for mac

diff --git a/backends/gdx-backend-ios/.classpath b/backends/gdx-backend-ios/.classpath
index b6c5780..3acd48d 100644 (file)
--- a/backends/gdx-backend-ios/.classpath
+++ b/backends/gdx-backend-ios/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src"/>
-       <classpathentry kind="lib" path="avian/build/darwin-x86_64-bootimage/classpath.jar"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry combineaccessrules="false" kind="src" path="/gdx"/>
        <classpathentry kind="output" path="target/classpath"/>
 </classpath>

diff --git a/demos/chip8/chip8/.project b/demos/chip8/chip8/.project
index 36c83f5..a73246e 100644 (file)
--- a/demos/chip8/chip8/.project
+++ b/demos/chip8/chip8/.project
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>chip8</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-       </natures>\r
-       <linkedResources>\r
-               <link>\r
-                       <name>assets</name>\r
-                       <type>2</type>\r
-                       <location>D:/workspaces/pennypop-workspace/libgdx/demos/chip8/chip8-android/assets</location>\r
-               </link>\r
-       </linkedResources>\r
-</projectDescription>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>chip8</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+       </natures>
+       <linkedResources>
+               <link>
+                       <name>assets</name>
+                       <type>2</type>
+                       <location>/Users/badlogic/eclipse/Eclipse.app/Contents/MacOS/D::/workspaces/pennypop-workspace/libgdx/demos/chip8/chip8-android/assets</location>
+               </link>
+       </linkedResources>
+</projectDescription>

diff --git a/extensions/gdx-audio/src/com/badlogic/gdx/audio/AudioBuild.java b/extensions/gdx-audio/src/com/badlogic/gdx/audio/AudioBuild.java
index 95bc6d9..e517d54 100644 (file)
--- a/extensions/gdx-audio/src/com/badlogic/gdx/audio/AudioBuild.java
+++ b/extensions/gdx-audio/src/com/badlogic/gdx/audio/AudioBuild.java
@@ -77,6 +77,15 @@ public class AudioBuild {
                lin64.cppExcludes = cppExcludes;\r
                lin64.preCompileTask = precompileTask;\r
                \r
+               BuildTarget mac = BuildTarget.newDefaultTarget(TargetOs.MacOsX, true);\r
+               lin64.cFlags += " -DFIXED_POINT";\r
+               lin64.cppFlags += " -DFIXED_POINT";\r
+               lin64.headerDirs = headerDirs;\r
+               lin64.cIncludes = cIncludes;\r
+               lin64.cppIncludes = cppIncludes;\r
+               lin64.cppExcludes = cppExcludes;\r
+               lin64.preCompileTask = precompileTask;\r
+               \r
                BuildTarget android = BuildTarget.newDefaultTarget(TargetOs.Android, false);\r
                android.cFlags += " -DFIXED_POINT -D_ARM_ASSEM_ -D__ANDROID__";\r
                android.cppFlags += " -DFIXED_POINT -D_ARM_ASSEM_ -D__ANDROID__";\r
@@ -86,7 +95,7 @@ public class AudioBuild {
                android.cppExcludes = cppExcludes;\r
                android.preCompileTask = precompileTask;\r
                \r
-               new AntScriptGenerator().generate(buildConfig, win32home, win32, win64, lin32, lin64, android);\r
+               new AntScriptGenerator().generate(buildConfig, win32home, win32, win64, lin32, lin64, mac, android);\r
                \r
                BuildExecutor.executeAnt("jni/build-windows32home.xml", "clean postcompile -v");\r
                BuildExecutor.executeAnt("jni/build.xml", "pack-natives -v");\r