Prechádzať zdrojové kódy

Remove libvorbis and add stb_vorbis for OS X and iOS.

fodinabor 9 rokov pred
rodič
commit
41e5f1f824

+ 8 - 16
build/ios/PolycodeCore/PolycodeCore.xcodeproj/project.pbxproj

@@ -8,7 +8,6 @@
 
 
 /* Begin PBXBuildFile section */
 /* Begin PBXBuildFile section */
 		6D904FDD1CCBF95700D0E80A /* PolyScript.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D904FDC1CCBF95700D0E80A /* PolyScript.cpp */; };
 		6D904FDD1CCBF95700D0E80A /* PolyScript.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D904FDC1CCBF95700D0E80A /* PolyScript.cpp */; };
-		6D904FE01CCBF9F900D0E80A /* duktape.c in Sources */ = {isa = PBXBuildFile; fileRef = 6D904FDF1CCBF9F900D0E80A /* duktape.c */; };
 		6D9D8C221CD975B1001E636B /* PolycodeLua.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D9D8C211CD975B1001E636B /* PolycodeLua.cpp */; };
 		6D9D8C221CD975B1001E636B /* PolycodeLua.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D9D8C211CD975B1001E636B /* PolycodeLua.cpp */; };
 		8A0F81471BF541F900E24F9B /* lodepng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F80F91BF541F800E24F9B /* lodepng.cpp */; };
 		8A0F81471BF541F900E24F9B /* lodepng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F80F91BF541F800E24F9B /* lodepng.cpp */; };
 		8A0F81481BF541F900E24F9B /* PolyBasicFileProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F80FA1BF541F800E24F9B /* PolyBasicFileProvider.cpp */; };
 		8A0F81481BF541F900E24F9B /* PolyBasicFileProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F80FA1BF541F800E24F9B /* PolyBasicFileProvider.cpp */; };
@@ -29,7 +28,6 @@
 		8A0F81571BF541F900E24F9B /* PolyEventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81091BF541F800E24F9B /* PolyEventDispatcher.cpp */; };
 		8A0F81571BF541F900E24F9B /* PolyEventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81091BF541F800E24F9B /* PolyEventDispatcher.cpp */; };
 		8A0F81581BF541F900E24F9B /* PolyEventHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F810A1BF541F800E24F9B /* PolyEventHandler.cpp */; };
 		8A0F81581BF541F900E24F9B /* PolyEventHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F810A1BF541F800E24F9B /* PolyEventHandler.cpp */; };
 		8A0F81591BF541F900E24F9B /* PolyFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F810B1BF541F800E24F9B /* PolyFont.cpp */; };
 		8A0F81591BF541F900E24F9B /* PolyFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F810B1BF541F800E24F9B /* PolyFont.cpp */; };
-		8A0F815A1BF541F900E24F9B /* PolyFontGlyphSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F810C1BF541F800E24F9B /* PolyFontGlyphSheet.cpp */; };
 		8A0F815C1BF541F900E24F9B /* PolyGPUDrawBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F810E1BF541F800E24F9B /* PolyGPUDrawBuffer.cpp */; };
 		8A0F815C1BF541F900E24F9B /* PolyGPUDrawBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F810E1BF541F800E24F9B /* PolyGPUDrawBuffer.cpp */; };
 		8A0F815D1BF541F900E24F9B /* PolyImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F810F1BF541F800E24F9B /* PolyImage.cpp */; };
 		8A0F815D1BF541F900E24F9B /* PolyImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F810F1BF541F800E24F9B /* PolyImage.cpp */; };
 		8A0F815E1BF541F900E24F9B /* PolyInputEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81101BF541F800E24F9B /* PolyInputEvent.cpp */; };
 		8A0F815E1BF541F900E24F9B /* PolyInputEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81101BF541F800E24F9B /* PolyInputEvent.cpp */; };
@@ -37,7 +35,6 @@
 		8A0F81601BF541F900E24F9B /* PolyLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81121BF541F800E24F9B /* PolyLabel.cpp */; };
 		8A0F81601BF541F900E24F9B /* PolyLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81121BF541F800E24F9B /* PolyLabel.cpp */; };
 		8A0F81611BF541F900E24F9B /* PolyLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81131BF541F800E24F9B /* PolyLogger.cpp */; };
 		8A0F81611BF541F900E24F9B /* PolyLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81131BF541F800E24F9B /* PolyLogger.cpp */; };
 		8A0F81621BF541F900E24F9B /* PolyMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81141BF541F800E24F9B /* PolyMaterial.cpp */; };
 		8A0F81621BF541F900E24F9B /* PolyMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81141BF541F800E24F9B /* PolyMaterial.cpp */; };
-		8A0F81631BF541F900E24F9B /* PolyMaterialManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81151BF541F800E24F9B /* PolyMaterialManager.cpp */; };
 		8A0F81641BF541F900E24F9B /* PolyMatrix4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81161BF541F800E24F9B /* PolyMatrix4.cpp */; };
 		8A0F81641BF541F900E24F9B /* PolyMatrix4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81161BF541F800E24F9B /* PolyMatrix4.cpp */; };
 		8A0F81651BF541F900E24F9B /* PolyMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81171BF541F800E24F9B /* PolyMesh.cpp */; };
 		8A0F81651BF541F900E24F9B /* PolyMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81171BF541F800E24F9B /* PolyMesh.cpp */; };
 		8A0F81661BF541F900E24F9B /* PolyObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81181BF541F800E24F9B /* PolyObject.cpp */; };
 		8A0F81661BF541F900E24F9B /* PolyObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81181BF541F800E24F9B /* PolyObject.cpp */; };
@@ -55,7 +52,6 @@
 		8A0F81731BF541F900E24F9B /* PolyResourceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81251BF541F800E24F9B /* PolyResourceManager.cpp */; };
 		8A0F81731BF541F900E24F9B /* PolyResourceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81251BF541F800E24F9B /* PolyResourceManager.cpp */; };
 		8A0F81741BF541F900E24F9B /* PolyScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81261BF541F800E24F9B /* PolyScene.cpp */; };
 		8A0F81741BF541F900E24F9B /* PolyScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81261BF541F800E24F9B /* PolyScene.cpp */; };
 		8A0F81751BF541F900E24F9B /* PolySceneEntityInstance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81271BF541F800E24F9B /* PolySceneEntityInstance.cpp */; };
 		8A0F81751BF541F900E24F9B /* PolySceneEntityInstance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81271BF541F800E24F9B /* PolySceneEntityInstance.cpp */; };
-		8A0F81761BF541F900E24F9B /* PolySceneImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81281BF541F800E24F9B /* PolySceneImage.cpp */; };
 		8A0F81771BF541F900E24F9B /* PolySceneLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81291BF541F800E24F9B /* PolySceneLabel.cpp */; };
 		8A0F81771BF541F900E24F9B /* PolySceneLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81291BF541F800E24F9B /* PolySceneLabel.cpp */; };
 		8A0F81781BF541F900E24F9B /* PolySceneLight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F812A1BF541F800E24F9B /* PolySceneLight.cpp */; };
 		8A0F81781BF541F900E24F9B /* PolySceneLight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F812A1BF541F800E24F9B /* PolySceneLight.cpp */; };
 		8A0F81791BF541F900E24F9B /* PolySceneLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F812B1BF541F800E24F9B /* PolySceneLine.cpp */; };
 		8A0F81791BF541F900E24F9B /* PolySceneLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F812B1BF541F800E24F9B /* PolySceneLine.cpp */; };
@@ -87,6 +83,8 @@
 		8A0F81931BF541F900E24F9B /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81451BF541F900E24F9B /* tinyxmlerror.cpp */; };
 		8A0F81931BF541F900E24F9B /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81451BF541F900E24F9B /* tinyxmlerror.cpp */; };
 		8A0F81941BF541F900E24F9B /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81461BF541F900E24F9B /* tinyxmlparser.cpp */; };
 		8A0F81941BF541F900E24F9B /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A0F81461BF541F900E24F9B /* tinyxmlparser.cpp */; };
 		8A35E1A11C87B25900BF9EEA /* PolyPhysFSFileProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A35E1A01C87B25900BF9EEA /* PolyPhysFSFileProvider.cpp */; };
 		8A35E1A11C87B25900BF9EEA /* PolyPhysFSFileProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A35E1A01C87B25900BF9EEA /* PolyPhysFSFileProvider.cpp */; };
+		AA2456D01D24434B00E34036 /* duktape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA2456CF1D24434B00E34036 /* duktape.cpp */; };
+		AA2456D21D24437400E34036 /* stb_vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA2456D11D24437400E34036 /* stb_vorbis.cpp */; };
 /* End PBXBuildFile section */
 /* End PBXBuildFile section */
 
 
 /* Begin PBXCopyFilesBuildPhase section */
 /* Begin PBXCopyFilesBuildPhase section */
@@ -104,7 +102,6 @@
 /* Begin PBXFileReference section */
 /* Begin PBXFileReference section */
 		6D904FDC1CCBF95700D0E80A /* PolyScript.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyScript.cpp; path = ../../../src/core/PolyScript.cpp; sourceTree = "<group>"; };
 		6D904FDC1CCBF95700D0E80A /* PolyScript.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyScript.cpp; path = ../../../src/core/PolyScript.cpp; sourceTree = "<group>"; };
 		6D904FDE1CCBF96D00D0E80A /* PolyScript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolyScript.h; path = ../../../include/polycode/core/PolyScript.h; sourceTree = "<group>"; };
 		6D904FDE1CCBF96D00D0E80A /* PolyScript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolyScript.h; path = ../../../include/polycode/core/PolyScript.h; sourceTree = "<group>"; };
-		6D904FDF1CCBF9F900D0E80A /* duktape.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = duktape.c; path = ../../../src/duktape/duktape.c; sourceTree = "<group>"; };
 		6D9D8C1F1CD9759E001E636B /* PolycodeLua.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodeLua.h; path = ../../../include/polycode/bindings/lua/PolycodeLua.h; sourceTree = "<group>"; };
 		6D9D8C1F1CD9759E001E636B /* PolycodeLua.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodeLua.h; path = ../../../include/polycode/bindings/lua/PolycodeLua.h; sourceTree = "<group>"; };
 		6D9D8C201CD9759E001E636B /* PolycodeLuaWrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodeLuaWrappers.h; path = ../../../include/polycode/bindings/lua/PolycodeLuaWrappers.h; sourceTree = "<group>"; };
 		6D9D8C201CD9759E001E636B /* PolycodeLuaWrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodeLuaWrappers.h; path = ../../../include/polycode/bindings/lua/PolycodeLuaWrappers.h; sourceTree = "<group>"; };
 		6D9D8C211CD975B1001E636B /* PolycodeLua.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp.preprocessed; fileEncoding = 4; name = PolycodeLua.cpp; path = ../../../src/bindings/lua/PolycodeLua.cpp; sourceTree = "<group>"; };
 		6D9D8C211CD975B1001E636B /* PolycodeLua.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp.preprocessed; fileEncoding = 4; name = PolycodeLua.cpp; path = ../../../src/bindings/lua/PolycodeLua.cpp; sourceTree = "<group>"; };
@@ -201,7 +198,6 @@
 		8A0F81091BF541F800E24F9B /* PolyEventDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyEventDispatcher.cpp; path = ../../../src/core/PolyEventDispatcher.cpp; sourceTree = "<group>"; };
 		8A0F81091BF541F800E24F9B /* PolyEventDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyEventDispatcher.cpp; path = ../../../src/core/PolyEventDispatcher.cpp; sourceTree = "<group>"; };
 		8A0F810A1BF541F800E24F9B /* PolyEventHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyEventHandler.cpp; path = ../../../src/core/PolyEventHandler.cpp; sourceTree = "<group>"; };
 		8A0F810A1BF541F800E24F9B /* PolyEventHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyEventHandler.cpp; path = ../../../src/core/PolyEventHandler.cpp; sourceTree = "<group>"; };
 		8A0F810B1BF541F800E24F9B /* PolyFont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyFont.cpp; path = ../../../src/core/PolyFont.cpp; sourceTree = "<group>"; };
 		8A0F810B1BF541F800E24F9B /* PolyFont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyFont.cpp; path = ../../../src/core/PolyFont.cpp; sourceTree = "<group>"; };
-		8A0F810C1BF541F800E24F9B /* PolyFontGlyphSheet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyFontGlyphSheet.cpp; path = ../../../src/core/PolyFontGlyphSheet.cpp; sourceTree = "<group>"; };
 		8A0F810E1BF541F800E24F9B /* PolyGPUDrawBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyGPUDrawBuffer.cpp; path = ../../../src/core/PolyGPUDrawBuffer.cpp; sourceTree = "<group>"; };
 		8A0F810E1BF541F800E24F9B /* PolyGPUDrawBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyGPUDrawBuffer.cpp; path = ../../../src/core/PolyGPUDrawBuffer.cpp; sourceTree = "<group>"; };
 		8A0F810F1BF541F800E24F9B /* PolyImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyImage.cpp; path = ../../../src/core/PolyImage.cpp; sourceTree = "<group>"; };
 		8A0F810F1BF541F800E24F9B /* PolyImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyImage.cpp; path = ../../../src/core/PolyImage.cpp; sourceTree = "<group>"; };
 		8A0F81101BF541F800E24F9B /* PolyInputEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyInputEvent.cpp; path = ../../../src/core/PolyInputEvent.cpp; sourceTree = "<group>"; };
 		8A0F81101BF541F800E24F9B /* PolyInputEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyInputEvent.cpp; path = ../../../src/core/PolyInputEvent.cpp; sourceTree = "<group>"; };
@@ -209,7 +205,6 @@
 		8A0F81121BF541F800E24F9B /* PolyLabel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyLabel.cpp; path = ../../../src/core/PolyLabel.cpp; sourceTree = "<group>"; };
 		8A0F81121BF541F800E24F9B /* PolyLabel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyLabel.cpp; path = ../../../src/core/PolyLabel.cpp; sourceTree = "<group>"; };
 		8A0F81131BF541F800E24F9B /* PolyLogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyLogger.cpp; path = ../../../src/core/PolyLogger.cpp; sourceTree = "<group>"; };
 		8A0F81131BF541F800E24F9B /* PolyLogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyLogger.cpp; path = ../../../src/core/PolyLogger.cpp; sourceTree = "<group>"; };
 		8A0F81141BF541F800E24F9B /* PolyMaterial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyMaterial.cpp; path = ../../../src/core/PolyMaterial.cpp; sourceTree = "<group>"; };
 		8A0F81141BF541F800E24F9B /* PolyMaterial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyMaterial.cpp; path = ../../../src/core/PolyMaterial.cpp; sourceTree = "<group>"; };
-		8A0F81151BF541F800E24F9B /* PolyMaterialManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyMaterialManager.cpp; path = ../../../src/core/PolyMaterialManager.cpp; sourceTree = "<group>"; };
 		8A0F81161BF541F800E24F9B /* PolyMatrix4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyMatrix4.cpp; path = ../../../src/core/PolyMatrix4.cpp; sourceTree = "<group>"; };
 		8A0F81161BF541F800E24F9B /* PolyMatrix4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyMatrix4.cpp; path = ../../../src/core/PolyMatrix4.cpp; sourceTree = "<group>"; };
 		8A0F81171BF541F800E24F9B /* PolyMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyMesh.cpp; path = ../../../src/core/PolyMesh.cpp; sourceTree = "<group>"; };
 		8A0F81171BF541F800E24F9B /* PolyMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyMesh.cpp; path = ../../../src/core/PolyMesh.cpp; sourceTree = "<group>"; };
 		8A0F81181BF541F800E24F9B /* PolyObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyObject.cpp; path = ../../../src/core/PolyObject.cpp; sourceTree = "<group>"; };
 		8A0F81181BF541F800E24F9B /* PolyObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyObject.cpp; path = ../../../src/core/PolyObject.cpp; sourceTree = "<group>"; };
@@ -227,7 +222,6 @@
 		8A0F81251BF541F800E24F9B /* PolyResourceManager.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = PolyResourceManager.cpp; path = ../../../src/core/PolyResourceManager.cpp; sourceTree = "<group>"; };
 		8A0F81251BF541F800E24F9B /* PolyResourceManager.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = PolyResourceManager.cpp; path = ../../../src/core/PolyResourceManager.cpp; sourceTree = "<group>"; };
 		8A0F81261BF541F800E24F9B /* PolyScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyScene.cpp; path = ../../../src/core/PolyScene.cpp; sourceTree = "<group>"; };
 		8A0F81261BF541F800E24F9B /* PolyScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyScene.cpp; path = ../../../src/core/PolyScene.cpp; sourceTree = "<group>"; };
 		8A0F81271BF541F800E24F9B /* PolySceneEntityInstance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolySceneEntityInstance.cpp; path = ../../../src/core/PolySceneEntityInstance.cpp; sourceTree = "<group>"; };
 		8A0F81271BF541F800E24F9B /* PolySceneEntityInstance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolySceneEntityInstance.cpp; path = ../../../src/core/PolySceneEntityInstance.cpp; sourceTree = "<group>"; };
-		8A0F81281BF541F800E24F9B /* PolySceneImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolySceneImage.cpp; path = ../../../src/core/PolySceneImage.cpp; sourceTree = "<group>"; };
 		8A0F81291BF541F800E24F9B /* PolySceneLabel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolySceneLabel.cpp; path = ../../../src/core/PolySceneLabel.cpp; sourceTree = "<group>"; };
 		8A0F81291BF541F800E24F9B /* PolySceneLabel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolySceneLabel.cpp; path = ../../../src/core/PolySceneLabel.cpp; sourceTree = "<group>"; };
 		8A0F812A1BF541F800E24F9B /* PolySceneLight.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolySceneLight.cpp; path = ../../../src/core/PolySceneLight.cpp; sourceTree = "<group>"; };
 		8A0F812A1BF541F800E24F9B /* PolySceneLight.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolySceneLight.cpp; path = ../../../src/core/PolySceneLight.cpp; sourceTree = "<group>"; };
 		8A0F812B1BF541F800E24F9B /* PolySceneLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolySceneLine.cpp; path = ../../../src/core/PolySceneLine.cpp; sourceTree = "<group>"; };
 		8A0F812B1BF541F800E24F9B /* PolySceneLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolySceneLine.cpp; path = ../../../src/core/PolySceneLine.cpp; sourceTree = "<group>"; };
@@ -260,6 +254,8 @@
 		8A0F81461BF541F900E24F9B /* tinyxmlparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tinyxmlparser.cpp; path = ../../../src/core/tinyxmlparser.cpp; sourceTree = "<group>"; };
 		8A0F81461BF541F900E24F9B /* tinyxmlparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tinyxmlparser.cpp; path = ../../../src/core/tinyxmlparser.cpp; sourceTree = "<group>"; };
 		8A35E19F1C87B20400BF9EEA /* PolyPhysFSFileProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolyPhysFSFileProvider.h; path = ../../../include/polycode/core/PolyPhysFSFileProvider.h; sourceTree = "<group>"; };
 		8A35E19F1C87B20400BF9EEA /* PolyPhysFSFileProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolyPhysFSFileProvider.h; path = ../../../include/polycode/core/PolyPhysFSFileProvider.h; sourceTree = "<group>"; };
 		8A35E1A01C87B25900BF9EEA /* PolyPhysFSFileProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyPhysFSFileProvider.cpp; path = ../../../src/core/PolyPhysFSFileProvider.cpp; sourceTree = "<group>"; };
 		8A35E1A01C87B25900BF9EEA /* PolyPhysFSFileProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolyPhysFSFileProvider.cpp; path = ../../../src/core/PolyPhysFSFileProvider.cpp; sourceTree = "<group>"; };
+		AA2456CF1D24434B00E34036 /* duktape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = duktape.cpp; path = ../../../src/duktape/duktape.cpp; sourceTree = "<group>"; };
+		AA2456D11D24437400E34036 /* stb_vorbis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = stb_vorbis.cpp; path = ../../../src/core/stb_vorbis.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* End PBXFileReference section */
 
 
 /* Begin PBXFrameworksBuildPhase section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -378,7 +374,7 @@
 			isa = PBXGroup;
 			isa = PBXGroup;
 			children = (
 			children = (
 				6D9D8C211CD975B1001E636B /* PolycodeLua.cpp */,
 				6D9D8C211CD975B1001E636B /* PolycodeLua.cpp */,
-				6D904FDF1CCBF9F900D0E80A /* duktape.c */,
+				AA2456CF1D24434B00E34036 /* duktape.cpp */,
 				8A0F80F91BF541F800E24F9B /* lodepng.cpp */,
 				8A0F80F91BF541F800E24F9B /* lodepng.cpp */,
 				8A0F80FA1BF541F800E24F9B /* PolyBasicFileProvider.cpp */,
 				8A0F80FA1BF541F800E24F9B /* PolyBasicFileProvider.cpp */,
 				8A0F80FB1BF541F800E24F9B /* PolyBezierCurve.cpp */,
 				8A0F80FB1BF541F800E24F9B /* PolyBezierCurve.cpp */,
@@ -399,7 +395,6 @@
 				8A0F81091BF541F800E24F9B /* PolyEventDispatcher.cpp */,
 				8A0F81091BF541F800E24F9B /* PolyEventDispatcher.cpp */,
 				8A0F810A1BF541F800E24F9B /* PolyEventHandler.cpp */,
 				8A0F810A1BF541F800E24F9B /* PolyEventHandler.cpp */,
 				8A0F810B1BF541F800E24F9B /* PolyFont.cpp */,
 				8A0F810B1BF541F800E24F9B /* PolyFont.cpp */,
-				8A0F810C1BF541F800E24F9B /* PolyFontGlyphSheet.cpp */,
 				8A0F810E1BF541F800E24F9B /* PolyGPUDrawBuffer.cpp */,
 				8A0F810E1BF541F800E24F9B /* PolyGPUDrawBuffer.cpp */,
 				8A0F810F1BF541F800E24F9B /* PolyImage.cpp */,
 				8A0F810F1BF541F800E24F9B /* PolyImage.cpp */,
 				8A0F81101BF541F800E24F9B /* PolyInputEvent.cpp */,
 				8A0F81101BF541F800E24F9B /* PolyInputEvent.cpp */,
@@ -407,7 +402,6 @@
 				8A0F81121BF541F800E24F9B /* PolyLabel.cpp */,
 				8A0F81121BF541F800E24F9B /* PolyLabel.cpp */,
 				8A0F81131BF541F800E24F9B /* PolyLogger.cpp */,
 				8A0F81131BF541F800E24F9B /* PolyLogger.cpp */,
 				8A0F81141BF541F800E24F9B /* PolyMaterial.cpp */,
 				8A0F81141BF541F800E24F9B /* PolyMaterial.cpp */,
-				8A0F81151BF541F800E24F9B /* PolyMaterialManager.cpp */,
 				8A0F81161BF541F800E24F9B /* PolyMatrix4.cpp */,
 				8A0F81161BF541F800E24F9B /* PolyMatrix4.cpp */,
 				8A0F81171BF541F800E24F9B /* PolyMesh.cpp */,
 				8A0F81171BF541F800E24F9B /* PolyMesh.cpp */,
 				8A0F81181BF541F800E24F9B /* PolyObject.cpp */,
 				8A0F81181BF541F800E24F9B /* PolyObject.cpp */,
@@ -425,7 +419,6 @@
 				8A0F81251BF541F800E24F9B /* PolyResourceManager.cpp */,
 				8A0F81251BF541F800E24F9B /* PolyResourceManager.cpp */,
 				8A0F81261BF541F800E24F9B /* PolyScene.cpp */,
 				8A0F81261BF541F800E24F9B /* PolyScene.cpp */,
 				8A0F81271BF541F800E24F9B /* PolySceneEntityInstance.cpp */,
 				8A0F81271BF541F800E24F9B /* PolySceneEntityInstance.cpp */,
-				8A0F81281BF541F800E24F9B /* PolySceneImage.cpp */,
 				8A0F81291BF541F800E24F9B /* PolySceneLabel.cpp */,
 				8A0F81291BF541F800E24F9B /* PolySceneLabel.cpp */,
 				8A0F812A1BF541F800E24F9B /* PolySceneLight.cpp */,
 				8A0F812A1BF541F800E24F9B /* PolySceneLight.cpp */,
 				8A0F812B1BF541F800E24F9B /* PolySceneLine.cpp */,
 				8A0F812B1BF541F800E24F9B /* PolySceneLine.cpp */,
@@ -453,6 +446,7 @@
 				8A0F81401BF541F800E24F9B /* PolyVector3.cpp */,
 				8A0F81401BF541F800E24F9B /* PolyVector3.cpp */,
 				8A0F81411BF541F800E24F9B /* PolyVector4.cpp */,
 				8A0F81411BF541F800E24F9B /* PolyVector4.cpp */,
 				8A0F81421BF541F800E24F9B /* rgbe.cpp */,
 				8A0F81421BF541F800E24F9B /* rgbe.cpp */,
+				AA2456D11D24437400E34036 /* stb_vorbis.cpp */,
 				8A0F81431BF541F800E24F9B /* tinystr.cpp */,
 				8A0F81431BF541F800E24F9B /* tinystr.cpp */,
 				8A0F81441BF541F900E24F9B /* tinyxml.cpp */,
 				8A0F81441BF541F900E24F9B /* tinyxml.cpp */,
 				8A0F81451BF541F900E24F9B /* tinyxmlerror.cpp */,
 				8A0F81451BF541F900E24F9B /* tinyxmlerror.cpp */,
@@ -534,6 +528,7 @@
 			isa = PBXSourcesBuildPhase;
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			buildActionMask = 2147483647;
 			files = (
 			files = (
+				AA2456D01D24434B00E34036 /* duktape.cpp in Sources */,
 				8A0F815F1BF541F900E24F9B /* PolyIOSCore.mm in Sources */,
 				8A0F815F1BF541F900E24F9B /* PolyIOSCore.mm in Sources */,
 				6D9D8C221CD975B1001E636B /* PolycodeLua.cpp in Sources */,
 				6D9D8C221CD975B1001E636B /* PolycodeLua.cpp in Sources */,
 				8A0F81911BF541F900E24F9B /* tinystr.cpp in Sources */,
 				8A0F81911BF541F900E24F9B /* tinystr.cpp in Sources */,
@@ -548,9 +543,7 @@
 				8A0F818C1BF541F900E24F9B /* PolyTweenManager.cpp in Sources */,
 				8A0F818C1BF541F900E24F9B /* PolyTweenManager.cpp in Sources */,
 				8A0F81591BF541F900E24F9B /* PolyFont.cpp in Sources */,
 				8A0F81591BF541F900E24F9B /* PolyFont.cpp in Sources */,
 				8A0F81881BF541F900E24F9B /* PolyThreaded.cpp in Sources */,
 				8A0F81881BF541F900E24F9B /* PolyThreaded.cpp in Sources */,
-				8A0F81761BF541F900E24F9B /* PolySceneImage.cpp in Sources */,
 				8A0F818D1BF541F900E24F9B /* PolyVector2.cpp in Sources */,
 				8A0F818D1BF541F900E24F9B /* PolyVector2.cpp in Sources */,
-				8A0F81631BF541F900E24F9B /* PolyMaterialManager.cpp in Sources */,
 				8A0F816C1BF541F900E24F9B /* PolyQuaternion.cpp in Sources */,
 				8A0F816C1BF541F900E24F9B /* PolyQuaternion.cpp in Sources */,
 				8A0F81651BF541F900E24F9B /* PolyMesh.cpp in Sources */,
 				8A0F81651BF541F900E24F9B /* PolyMesh.cpp in Sources */,
 				8A0F81781BF541F900E24F9B /* PolySceneLight.cpp in Sources */,
 				8A0F81781BF541F900E24F9B /* PolySceneLight.cpp in Sources */,
@@ -573,6 +566,7 @@
 				8A0F81801BF541F900E24F9B /* PolyServer.cpp in Sources */,
 				8A0F81801BF541F900E24F9B /* PolyServer.cpp in Sources */,
 				8A0F81851BF541F900E24F9B /* PolySoundManager.cpp in Sources */,
 				8A0F81851BF541F900E24F9B /* PolySoundManager.cpp in Sources */,
 				8A0F818A1BF541F900E24F9B /* PolyTimerManager.cpp in Sources */,
 				8A0F818A1BF541F900E24F9B /* PolyTimerManager.cpp in Sources */,
+				AA2456D21D24437400E34036 /* stb_vorbis.cpp in Sources */,
 				8A0F81751BF541F900E24F9B /* PolySceneEntityInstance.cpp in Sources */,
 				8A0F81751BF541F900E24F9B /* PolySceneEntityInstance.cpp in Sources */,
 				8A0F81721BF541F900E24F9B /* PolyResource.cpp in Sources */,
 				8A0F81721BF541F900E24F9B /* PolyResource.cpp in Sources */,
 				8A0F817F1BF541F900E24F9B /* PolySceneSprite.cpp in Sources */,
 				8A0F817F1BF541F900E24F9B /* PolySceneSprite.cpp in Sources */,
@@ -586,7 +580,6 @@
 				8A0F81511BF541F900E24F9B /* PolyCoreInput.cpp in Sources */,
 				8A0F81511BF541F900E24F9B /* PolyCoreInput.cpp in Sources */,
 				8A0F815C1BF541F900E24F9B /* PolyGPUDrawBuffer.cpp in Sources */,
 				8A0F815C1BF541F900E24F9B /* PolyGPUDrawBuffer.cpp in Sources */,
 				8A0F81811BF541F900E24F9B /* PolyShader.cpp in Sources */,
 				8A0F81811BF541F900E24F9B /* PolyShader.cpp in Sources */,
-				8A0F815A1BF541F900E24F9B /* PolyFontGlyphSheet.cpp in Sources */,
 				8A0F81901BF541F900E24F9B /* rgbe.cpp in Sources */,
 				8A0F81901BF541F900E24F9B /* rgbe.cpp in Sources */,
 				8A0F81571BF541F900E24F9B /* PolyEventDispatcher.cpp in Sources */,
 				8A0F81571BF541F900E24F9B /* PolyEventDispatcher.cpp in Sources */,
 				8A0F81891BF541F900E24F9B /* PolyTimer.cpp in Sources */,
 				8A0F81891BF541F900E24F9B /* PolyTimer.cpp in Sources */,
@@ -603,7 +596,6 @@
 				8A0F818E1BF541F900E24F9B /* PolyVector3.cpp in Sources */,
 				8A0F818E1BF541F900E24F9B /* PolyVector3.cpp in Sources */,
 				8A0F81691BF541F900E24F9B /* PolyPeer.cpp in Sources */,
 				8A0F81691BF541F900E24F9B /* PolyPeer.cpp in Sources */,
 				8A0F81531BF541F900E24F9B /* PolyCubemap.cpp in Sources */,
 				8A0F81531BF541F900E24F9B /* PolyCubemap.cpp in Sources */,
-				6D904FE01CCBF9F900D0E80A /* duktape.c in Sources */,
 				8A0F817E1BF541F900E24F9B /* PolySceneSound.cpp in Sources */,
 				8A0F817E1BF541F900E24F9B /* PolySceneSound.cpp in Sources */,
 				8A0F81791BF541F900E24F9B /* PolySceneLine.cpp in Sources */,
 				8A0F81791BF541F900E24F9B /* PolySceneLine.cpp in Sources */,
 				8A0F81661BF541F900E24F9B /* PolyObject.cpp in Sources */,
 				8A0F81661BF541F900E24F9B /* PolyObject.cpp in Sources */,

+ 0 - 12
build/ios/TemplateApp/TemplateApp.xcodeproj/project.pbxproj

@@ -8,9 +8,6 @@
 
 
 /* Begin PBXBuildFile section */
 /* Begin PBXBuildFile section */
 		6D086CF21CD9B3770057F210 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D086CF11CD9B3770057F210 /* AudioToolbox.framework */; };
 		6D086CF21CD9B3770057F210 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D086CF11CD9B3770057F210 /* AudioToolbox.framework */; };
-		6D086D661CD9BC330057F210 /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D086D631CD9BC330057F210 /* libogg.a */; };
-		6D086D671CD9BC330057F210 /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D086D641CD9BC330057F210 /* libvorbis.a */; };
-		6D086D681CD9BC330057F210 /* libvorbisfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D086D651CD9BC330057F210 /* libvorbisfile.a */; };
 		6D086D6A1CD9BC820057F210 /* test.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 6D086D691CD9BC820057F210 /* test.ogg */; };
 		6D086D6A1CD9BC820057F210 /* test.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 6D086D691CD9BC820057F210 /* test.ogg */; };
 		6D1992381CD692ED00DE01FA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D1992341CD692ED00DE01FA /* QuartzCore.framework */; };
 		6D1992381CD692ED00DE01FA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D1992341CD692ED00DE01FA /* QuartzCore.framework */; };
 		6D1992391CD692ED00DE01FA /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D1992351CD692ED00DE01FA /* CoreMotion.framework */; };
 		6D1992391CD692ED00DE01FA /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D1992351CD692ED00DE01FA /* CoreMotion.framework */; };
@@ -34,9 +31,6 @@
 
 
 /* Begin PBXFileReference section */
 /* Begin PBXFileReference section */
 		6D086CF11CD9B3770057F210 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		6D086CF11CD9B3770057F210 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
-		6D086D631CD9BC330057F210 /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = ../../../../lib/ios/iphonesimulator/libogg.a; sourceTree = "<group>"; };
-		6D086D641CD9BC330057F210 /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = ../../../../lib/ios/iphonesimulator/libvorbis.a; sourceTree = "<group>"; };
-		6D086D651CD9BC330057F210 /* libvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisfile.a; path = ../../../../lib/ios/iphonesimulator/libvorbisfile.a; sourceTree = "<group>"; };
 		6D086D691CD9BC820057F210 /* test.ogg */ = {isa = PBXFileReference; lastKnownFileType = file; name = test.ogg; path = ../../../../../../../Downloads/test.ogg; sourceTree = "<group>"; };
 		6D086D691CD9BC820057F210 /* test.ogg */ = {isa = PBXFileReference; lastKnownFileType = file; name = test.ogg; path = ../../../../../../../Downloads/test.ogg; sourceTree = "<group>"; };
 		6D1992341CD692ED00DE01FA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		6D1992341CD692ED00DE01FA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		6D1992351CD692ED00DE01FA /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
 		6D1992351CD692ED00DE01FA /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
@@ -72,14 +66,11 @@
 				6D086CF21CD9B3770057F210 /* AudioToolbox.framework in Frameworks */,
 				6D086CF21CD9B3770057F210 /* AudioToolbox.framework in Frameworks */,
 				6D1992381CD692ED00DE01FA /* QuartzCore.framework in Frameworks */,
 				6D1992381CD692ED00DE01FA /* QuartzCore.framework in Frameworks */,
 				6D1992391CD692ED00DE01FA /* CoreMotion.framework in Frameworks */,
 				6D1992391CD692ED00DE01FA /* CoreMotion.framework in Frameworks */,
-				6D086D661CD9BC330057F210 /* libogg.a in Frameworks */,
 				6D90505D1CCBFFD400D0E80A /* liblua.a in Frameworks */,
 				6D90505D1CCBFFD400D0E80A /* liblua.a in Frameworks */,
 				6D19923B1CD692ED00DE01FA /* OpenGLES.framework in Frameworks */,
 				6D19923B1CD692ED00DE01FA /* OpenGLES.framework in Frameworks */,
-				6D086D681CD9BC330057F210 /* libvorbisfile.a in Frameworks */,
 				8A35E14F1C877DDB00BF9EEA /* libFreetype2.a in Frameworks */,
 				8A35E14F1C877DDB00BF9EEA /* libFreetype2.a in Frameworks */,
 				8A35E1C61C87B3BC00BF9EEA /* libphysfs.a in Frameworks */,
 				8A35E1C61C87B3BC00BF9EEA /* libphysfs.a in Frameworks */,
 				6D19923A1CD692ED00DE01FA /* UIKit.framework in Frameworks */,
 				6D19923A1CD692ED00DE01FA /* UIKit.framework in Frameworks */,
-				6D086D671CD9BC330057F210 /* libvorbis.a in Frameworks */,
 				8AD300AB1BF68290004D243B /* libPolycodeCore.a in Frameworks */,
 				8AD300AB1BF68290004D243B /* libPolycodeCore.a in Frameworks */,
 			);
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -106,9 +97,6 @@
 		8A0F805E1BF536C800E24F9B /* TemplateApp */ = {
 		8A0F805E1BF536C800E24F9B /* TemplateApp */ = {
 			isa = PBXGroup;
 			isa = PBXGroup;
 			children = (
 			children = (
-				6D086D631CD9BC330057F210 /* libogg.a */,
-				6D086D641CD9BC330057F210 /* libvorbis.a */,
-				6D086D651CD9BC330057F210 /* libvorbisfile.a */,
 				6D086CF11CD9B3770057F210 /* AudioToolbox.framework */,
 				6D086CF11CD9B3770057F210 /* AudioToolbox.framework */,
 				6D1992341CD692ED00DE01FA /* QuartzCore.framework */,
 				6D1992341CD692ED00DE01FA /* QuartzCore.framework */,
 				6D1992351CD692ED00DE01FA /* CoreMotion.framework */,
 				6D1992351CD692ED00DE01FA /* CoreMotion.framework */,

+ 4 - 0
build/osx/PolycodeCore/PolycodeCore.xcodeproj/project.pbxproj

@@ -169,6 +169,7 @@
 		8A9D122F1CDD503C00ACD484 /* PolycodeJS.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A9D122D1CDD503C00ACD484 /* PolycodeJS.h */; };
 		8A9D122F1CDD503C00ACD484 /* PolycodeJS.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A9D122D1CDD503C00ACD484 /* PolycodeJS.h */; };
 		8A9D12301CDD503C00ACD484 /* PolycodeJSWrappers.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A9D122E1CDD503C00ACD484 /* PolycodeJSWrappers.h */; };
 		8A9D12301CDD503C00ACD484 /* PolycodeJSWrappers.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A9D122E1CDD503C00ACD484 /* PolycodeJSWrappers.h */; };
 		8A9D12321CDD504400ACD484 /* PolycodeJS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A9D12311CDD504400ACD484 /* PolycodeJS.cpp */; };
 		8A9D12321CDD504400ACD484 /* PolycodeJS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A9D12311CDD504400ACD484 /* PolycodeJS.cpp */; };
+		AA5DCB931D2433BE0021D0F8 /* stb_vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA5DCB921D2433BE0021D0F8 /* stb_vorbis.cpp */; };
 /* End PBXBuildFile section */
 /* End PBXBuildFile section */
 
 
 /* Begin PBXFileReference section */
 /* Begin PBXFileReference section */
@@ -335,6 +336,7 @@
 		8A9D122D1CDD503C00ACD484 /* PolycodeJS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodeJS.h; path = ../../../include/polycode/bindings/javascript/PolycodeJS.h; sourceTree = "<group>"; };
 		8A9D122D1CDD503C00ACD484 /* PolycodeJS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodeJS.h; path = ../../../include/polycode/bindings/javascript/PolycodeJS.h; sourceTree = "<group>"; };
 		8A9D122E1CDD503C00ACD484 /* PolycodeJSWrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodeJSWrappers.h; path = ../../../include/polycode/bindings/javascript/PolycodeJSWrappers.h; sourceTree = "<group>"; };
 		8A9D122E1CDD503C00ACD484 /* PolycodeJSWrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodeJSWrappers.h; path = ../../../include/polycode/bindings/javascript/PolycodeJSWrappers.h; sourceTree = "<group>"; };
 		8A9D12311CDD504400ACD484 /* PolycodeJS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolycodeJS.cpp; path = ../../../src/bindings/javascript/PolycodeJS.cpp; sourceTree = "<group>"; };
 		8A9D12311CDD504400ACD484 /* PolycodeJS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PolycodeJS.cpp; path = ../../../src/bindings/javascript/PolycodeJS.cpp; sourceTree = "<group>"; };
+		AA5DCB921D2433BE0021D0F8 /* stb_vorbis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = stb_vorbis.cpp; path = ../../../src/core/stb_vorbis.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* End PBXFileReference section */
 
 
 /* Begin PBXFrameworksBuildPhase section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -435,6 +437,7 @@
 				8A8652CF1B72867F009F94DD /* PolyVector4.cpp */,
 				8A8652CF1B72867F009F94DD /* PolyVector4.cpp */,
 				8A7349091B86A54800F660C0 /* lodepng.cpp */,
 				8A7349091B86A54800F660C0 /* lodepng.cpp */,
 				8A8652D01B72867F009F94DD /* rgbe.cpp */,
 				8A8652D01B72867F009F94DD /* rgbe.cpp */,
+				AA5DCB921D2433BE0021D0F8 /* stb_vorbis.cpp */,
 				8A8652D11B72867F009F94DD /* tinystr.cpp */,
 				8A8652D11B72867F009F94DD /* tinystr.cpp */,
 				8A8652D21B72867F009F94DD /* tinyxml.cpp */,
 				8A8652D21B72867F009F94DD /* tinyxml.cpp */,
 				8A8652D31B72867F009F94DD /* tinyxmlerror.cpp */,
 				8A8652D31B72867F009F94DD /* tinyxmlerror.cpp */,
@@ -711,6 +714,7 @@
 				8A8652DF1B72867F009F94DD /* PolyCoreServices.cpp in Sources */,
 				8A8652DF1B72867F009F94DD /* PolyCoreServices.cpp in Sources */,
 				8A8652FC1B72867F009F94DD /* PolyRenderer.cpp in Sources */,
 				8A8652FC1B72867F009F94DD /* PolyRenderer.cpp in Sources */,
 				8A8653131B72867F009F94DD /* PolyThreaded.cpp in Sources */,
 				8A8653131B72867F009F94DD /* PolyThreaded.cpp in Sources */,
+				AA5DCB931D2433BE0021D0F8 /* stb_vorbis.cpp in Sources */,
 				8A8652F11B72867F009F94DD /* PolyMesh.cpp in Sources */,
 				8A8652F11B72867F009F94DD /* PolyMesh.cpp in Sources */,
 				8A8652E21B72867F009F94DD /* PolyEntity.cpp in Sources */,
 				8A8652E21B72867F009F94DD /* PolyEntity.cpp in Sources */,
 				8A8652F21B72867F009F94DD /* PolyObject.cpp in Sources */,
 				8A8652F21B72867F009F94DD /* PolyObject.cpp in Sources */,

+ 0 - 6
build/osx/PolycodeStudio/PolycodeStudio.xcodeproj/project.pbxproj

@@ -52,10 +52,7 @@
 		8A36D2731B8E5BA9009897D0 /* TrackballCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A36D2511B8E5BA9009897D0 /* TrackballCamera.cpp */; };
 		8A36D2731B8E5BA9009897D0 /* TrackballCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A36D2511B8E5BA9009897D0 /* TrackballCamera.cpp */; };
 		8A36D2741B8E5BA9009897D0 /* TransformGizmo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A36D2521B8E5BA9009897D0 /* TransformGizmo.cpp */; };
 		8A36D2741B8E5BA9009897D0 /* TransformGizmo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A36D2521B8E5BA9009897D0 /* TransformGizmo.cpp */; };
 		8A36D31B1B8E6FD5009897D0 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A36D3111B8E6FD5009897D0 /* libfreetype.a */; };
 		8A36D31B1B8E6FD5009897D0 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A36D3111B8E6FD5009897D0 /* libfreetype.a */; };
-		8A36D31C1B8E6FD5009897D0 /* liblibogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A36D3121B8E6FD5009897D0 /* liblibogg.a */; };
-		8A36D31D1B8E6FD5009897D0 /* liblibvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A36D3131B8E6FD5009897D0 /* liblibvorbis.a */; };
 		8A36D31E1B8E6FD5009897D0 /* libportaudio.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A36D3141B8E6FD5009897D0 /* libportaudio.a */; };
 		8A36D31E1B8E6FD5009897D0 /* libportaudio.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A36D3141B8E6FD5009897D0 /* libportaudio.a */; };
-		8A36D31F1B8E6FD5009897D0 /* liblibvorbisfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A36D3151B8E6FD5009897D0 /* liblibvorbisfile.a */; };
 		8A36D3211B8E6FD5009897D0 /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A36D3171B8E6FD5009897D0 /* libphysfs.a */; };
 		8A36D3211B8E6FD5009897D0 /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A36D3171B8E6FD5009897D0 /* libphysfs.a */; };
 		8A36D3231B8E6FD5009897D0 /* libPolycore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A36D3191B8E6FD5009897D0 /* libPolycore.a */; };
 		8A36D3231B8E6FD5009897D0 /* libPolycore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A36D3191B8E6FD5009897D0 /* libPolycore.a */; };
 		8A36D3241B8E6FD5009897D0 /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A36D31A1B8E6FD5009897D0 /* libz.a */; };
 		8A36D3241B8E6FD5009897D0 /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A36D31A1B8E6FD5009897D0 /* libz.a */; };
@@ -168,16 +165,13 @@
 				8A22D92F1BCC6809009EF0A6 /* CoreAudio.framework in Frameworks */,
 				8A22D92F1BCC6809009EF0A6 /* CoreAudio.framework in Frameworks */,
 				8A22D92D1BCC67E6009EF0A6 /* AudioUnit.framework in Frameworks */,
 				8A22D92D1BCC67E6009EF0A6 /* AudioUnit.framework in Frameworks */,
 				8A22D92B1BCC67DE009EF0A6 /* OpenGL.framework in Frameworks */,
 				8A22D92B1BCC67DE009EF0A6 /* OpenGL.framework in Frameworks */,
-				8A36D31D1B8E6FD5009897D0 /* liblibvorbis.a in Frameworks */,
 				8A36D3231B8E6FD5009897D0 /* libPolycore.a in Frameworks */,
 				8A36D3231B8E6FD5009897D0 /* libPolycore.a in Frameworks */,
-				8A36D31F1B8E6FD5009897D0 /* liblibvorbisfile.a in Frameworks */,
 				8A36D31E1B8E6FD5009897D0 /* libportaudio.a in Frameworks */,
 				8A36D31E1B8E6FD5009897D0 /* libportaudio.a in Frameworks */,
 				8A36D3261B8E6FE7009897D0 /* libPolycodeUI.a in Frameworks */,
 				8A36D3261B8E6FE7009897D0 /* libPolycodeUI.a in Frameworks */,
 				8A36D31B1B8E6FD5009897D0 /* libfreetype.a in Frameworks */,
 				8A36D31B1B8E6FD5009897D0 /* libfreetype.a in Frameworks */,
 				6D90506D1CCC058F00D0E80A /* liblua.a in Frameworks */,
 				6D90506D1CCC058F00D0E80A /* liblua.a in Frameworks */,
 				8A36D3211B8E6FD5009897D0 /* libphysfs.a in Frameworks */,
 				8A36D3211B8E6FD5009897D0 /* libphysfs.a in Frameworks */,
 				8A36D3241B8E6FD5009897D0 /* libz.a in Frameworks */,
 				8A36D3241B8E6FD5009897D0 /* libz.a in Frameworks */,
-				8A36D31C1B8E6FD5009897D0 /* liblibogg.a in Frameworks */,
 			);
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		};

+ 0 - 6
build/osx/TemplateApp/TemplateApp.xcodeproj/project.pbxproj

@@ -24,9 +24,6 @@
 		8A86533B1B72931C009F94DD /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8A86533A1B72931C009F94DD /* Images.xcassets */; };
 		8A86533B1B72931C009F94DD /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8A86533A1B72931C009F94DD /* Images.xcassets */; };
 		8A86533E1B72931C009F94DD /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8A86533C1B72931C009F94DD /* MainMenu.xib */; };
 		8A86533E1B72931C009F94DD /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8A86533C1B72931C009F94DD /* MainMenu.xib */; };
 		8A86535C1B72949F009F94DD /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A8653531B72949F009F94DD /* libfreetype.a */; };
 		8A86535C1B72949F009F94DD /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A8653531B72949F009F94DD /* libfreetype.a */; };
-		8A86535D1B72949F009F94DD /* liblibogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A8653541B72949F009F94DD /* liblibogg.a */; };
-		8A86535E1B72949F009F94DD /* liblibvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A8653551B72949F009F94DD /* liblibvorbis.a */; };
-		8A86535F1B72949F009F94DD /* liblibvorbisfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A8653561B72949F009F94DD /* liblibvorbisfile.a */; };
 		8A8653611B72949F009F94DD /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A8653581B72949F009F94DD /* libphysfs.a */; };
 		8A8653611B72949F009F94DD /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A8653581B72949F009F94DD /* libphysfs.a */; };
 		8A8653631B72949F009F94DD /* libPolycore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A86535A1B72949F009F94DD /* libPolycore.a */; };
 		8A8653631B72949F009F94DD /* libPolycore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A86535A1B72949F009F94DD /* libPolycore.a */; };
 		8A8653641B72949F009F94DD /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A86535B1B72949F009F94DD /* libz.a */; };
 		8A8653641B72949F009F94DD /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A86535B1B72949F009F94DD /* libz.a */; };
@@ -89,13 +86,10 @@
 				8A8653641B72949F009F94DD /* libz.a in Frameworks */,
 				8A8653641B72949F009F94DD /* libz.a in Frameworks */,
 				8A825F271B82A2680039E823 /* libportaudio.a in Frameworks */,
 				8A825F271B82A2680039E823 /* libportaudio.a in Frameworks */,
 				8A8653631B72949F009F94DD /* libPolycore.a in Frameworks */,
 				8A8653631B72949F009F94DD /* libPolycore.a in Frameworks */,
-				8A86535F1B72949F009F94DD /* liblibvorbisfile.a in Frameworks */,
-				8A86535E1B72949F009F94DD /* liblibvorbis.a in Frameworks */,
 				8A86535C1B72949F009F94DD /* libfreetype.a in Frameworks */,
 				8A86535C1B72949F009F94DD /* libfreetype.a in Frameworks */,
 				6D90506B1CCC057C00D0E80A /* liblua.a in Frameworks */,
 				6D90506B1CCC057C00D0E80A /* liblua.a in Frameworks */,
 				6DD2D0B61BEEDC150026D85C /* libportaudio.a in Frameworks */,
 				6DD2D0B61BEEDC150026D85C /* libportaudio.a in Frameworks */,
 				8A8653611B72949F009F94DD /* libphysfs.a in Frameworks */,
 				8A8653611B72949F009F94DD /* libphysfs.a in Frameworks */,
-				8A86535D1B72949F009F94DD /* liblibogg.a in Frameworks */,
 			);
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		};

+ 1 - 1
lib

@@ -1 +1 @@
-Subproject commit cbd0b400c695ee6626d562365990846bc74cfc99
+Subproject commit 5fe8534491efb52b6fe0d7e47274916eeceffc58