From 05a43ddcdb1ccab4dca3c640f6a559be830636bb Mon Sep 17 00:00:00 2001 From: kts Date: Sat, 28 Feb 2015 14:43:09 -0800 Subject: [PATCH] Updated iOS, OSX, and Android projects --- build/android/jni/src/Android.mk | 8 ++++++++ .../Roll them Bones.xcodeproj/project.pbxproj | 18 ++++++++++++++++++ .../Roll them Bones.xcodeproj/project.pbxproj | 6 ++++++ 3 files changed, 32 insertions(+) diff --git a/build/android/jni/src/Android.mk b/build/android/jni/src/Android.mk index 0b3e3ca..50377b7 100755 --- a/build/android/jni/src/Android.mk +++ b/build/android/jni/src/Android.mk @@ -34,6 +34,14 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \ ../../../../src/Quat.hpp \ ../../../../src/fio.cpp \ ../../../../src/fio.hpp \ + ../../../../src/AssetManager.cpp \ + ../../../../src/AssetManager.hpp \ + ../../../../src/AssetCache.cpp \ + ../../../../src/AssetCache.hpp \ + ../../../../src/Asset.cpp \ + ../../../../src/Asset.hpp \ + ../../../../src/checksum.cpp \ + ../../../../src/checksum.hpp \ ../../../../src/common.hpp \ ../../../../src/Core.cpp \ ../../../../src/Core.hpp \ diff --git a/build/ios/Roll them Bones.xcodeproj/project.pbxproj b/build/ios/Roll them Bones.xcodeproj/project.pbxproj index 56a3062..1655c63 100755 --- a/build/ios/Roll them Bones.xcodeproj/project.pbxproj +++ b/build/ios/Roll them Bones.xcodeproj/project.pbxproj @@ -36,6 +36,9 @@ 20A7A9201A89F91300EDC1A0 /* RenderView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20A7A91B1A89F91300EDC1A0 /* RenderView.cpp */; }; 20E3F33B1A8CEC110071FD41 /* Log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20E3F3371A8CEC110071FD41 /* Log.cpp */; }; 20E3F33C1A8CEC110071FD41 /* Mesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20E3F3391A8CEC110071FD41 /* Mesh.cpp */; }; + 20F746691AA27B8C00F5846A /* Asset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F746631AA27B8C00F5846A /* Asset.cpp */; }; + 20F7466A1AA27B8C00F5846A /* AssetCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F746651AA27B8C00F5846A /* AssetCache.cpp */; }; + 20F7466B1AA27B8C00F5846A /* AssetManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F746671AA27B8C00F5846A /* AssetManager.cpp */; }; 20FD2D3B1A67470A00B32F7B /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20FD2D3A1A67470A00B32F7B /* main.cpp */; }; 28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; }; 28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; }; @@ -173,6 +176,12 @@ 20E3F3391A8CEC110071FD41 /* Mesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Mesh.cpp; path = ../../src/Mesh.cpp; sourceTree = SOURCE_ROOT; }; 20E3F33A1A8CEC110071FD41 /* Mesh.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Mesh.hpp; path = ../../src/Mesh.hpp; sourceTree = SOURCE_ROOT; }; 20E3F36F1A8CED0D0071FD41 /* SDL_opengles2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_opengles2.h; path = "../../../android/SDL2-2.0.3/include/SDL_opengles2.h"; sourceTree = SOURCE_ROOT; }; + 20F746631AA27B8C00F5846A /* Asset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Asset.cpp; path = ../../src/Asset.cpp; sourceTree = SOURCE_ROOT; }; + 20F746641AA27B8C00F5846A /* Asset.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Asset.hpp; path = ../../src/Asset.hpp; sourceTree = SOURCE_ROOT; }; + 20F746651AA27B8C00F5846A /* AssetCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AssetCache.cpp; path = ../../src/AssetCache.cpp; sourceTree = SOURCE_ROOT; }; + 20F746661AA27B8C00F5846A /* AssetCache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = AssetCache.hpp; path = ../../src/AssetCache.hpp; sourceTree = SOURCE_ROOT; }; + 20F746671AA27B8C00F5846A /* AssetManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AssetManager.cpp; path = ../../src/AssetManager.cpp; sourceTree = SOURCE_ROOT; }; + 20F746681AA27B8C00F5846A /* AssetManager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = AssetManager.hpp; path = ../../src/AssetManager.hpp; sourceTree = SOURCE_ROOT; }; 20FD2D3A1A67470A00B32F7B /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../../src/main.cpp; sourceTree = SOURCE_ROOT; }; 28FD14FF0DC6FC520079059D /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 28FD15070DC6FC5B0079059D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; @@ -327,6 +336,12 @@ 20A7A9131A89F8F600EDC1A0 /* Classes */ = { isa = PBXGroup; children = ( + 20F746631AA27B8C00F5846A /* Asset.cpp */, + 20F746641AA27B8C00F5846A /* Asset.hpp */, + 20F746651AA27B8C00F5846A /* AssetCache.cpp */, + 20F746661AA27B8C00F5846A /* AssetCache.hpp */, + 20F746671AA27B8C00F5846A /* AssetManager.cpp */, + 20F746681AA27B8C00F5846A /* AssetManager.hpp */, 20517E581A9D4A0300DE49E9 /* Core.cpp */, 20517E591A9D4A0300DE49E9 /* Core.hpp */, 20517C8B1A9B40A200DE49E9 /* Program.cpp */, @@ -498,6 +513,9 @@ 20517DB91A9C237D00DE49E9 /* checksum.cpp in Sources */, 20517DBA1A9C237D00DE49E9 /* fio.cpp in Sources */, 20517E5A1A9D4A0300DE49E9 /* Core.cpp in Sources */, + 20F746691AA27B8C00F5846A /* Asset.cpp in Sources */, + 20F7466A1AA27B8C00F5846A /* AssetCache.cpp in Sources */, + 20F7466B1AA27B8C00F5846A /* AssetManager.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/build/osx/Roll them Bones.xcodeproj/project.pbxproj b/build/osx/Roll them Bones.xcodeproj/project.pbxproj index b52f94c..3d78db4 100644 --- a/build/osx/Roll them Bones.xcodeproj/project.pbxproj +++ b/build/osx/Roll them Bones.xcodeproj/project.pbxproj @@ -37,6 +37,7 @@ 20A8CE551A899B72004D2504 /* RenderView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20A8CE521A899B72004D2504 /* RenderView.cpp */; }; 20E3F2941A8CE8470071FD41 /* Log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20E3F2901A8CE8470071FD41 /* Log.cpp */; }; 20E3F2951A8CE8470071FD41 /* Mesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20E3F2921A8CE8470071FD41 /* Mesh.cpp */; }; + 20F746501AA1DE0F00F5846A /* AssetCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F7464E1AA1DE0F00F5846A /* AssetCache.cpp */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ @@ -114,6 +115,8 @@ 20E3F2911A8CE8470071FD41 /* Log.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Log.hpp; path = ../../src/Log.hpp; sourceTree = SOURCE_ROOT; }; 20E3F2921A8CE8470071FD41 /* Mesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Mesh.cpp; path = ../../src/Mesh.cpp; sourceTree = SOURCE_ROOT; }; 20E3F2931A8CE8470071FD41 /* Mesh.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Mesh.hpp; path = ../../src/Mesh.hpp; sourceTree = SOURCE_ROOT; }; + 20F7464E1AA1DE0F00F5846A /* AssetCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AssetCache.cpp; path = ../../src/AssetCache.cpp; sourceTree = SOURCE_ROOT; }; + 20F7464F1AA1DE0F00F5846A /* AssetCache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = AssetCache.hpp; path = ../../src/AssetCache.hpp; sourceTree = SOURCE_ROOT; }; 8D1107320486CEB800E47090 /* Roll them Bones.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Roll them Bones.app"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -135,6 +138,8 @@ 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( + 20F7464E1AA1DE0F00F5846A /* AssetCache.cpp */, + 20F7464F1AA1DE0F00F5846A /* AssetCache.hpp */, 205183CA1A9F330000DE49E9 /* Asset.cpp */, 205183CB1A9F330000DE49E9 /* Asset.hpp */, 205183C51A9F324600DE49E9 /* AssetManager.cpp */, @@ -370,6 +375,7 @@ 20517DCE1A9D44DB00DE49E9 /* Core.cpp in Sources */, 205183C71A9F324700DE49E9 /* AssetManager.cpp in Sources */, 205183CC1A9F330000DE49E9 /* Asset.cpp in Sources */, + 20F746501AA1DE0F00F5846A /* AssetCache.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };