kts
/
RtB
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated ios, osx, and android builds - all work fine.

master
kts 2015-03-02 20:08:00 -08:00
parent a567769fcf
commit 8b93c18bd5
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/android/jni/src/Android.mk
View File

@ -51,6 +51,8 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
../../../../src/State.hpp \ ../../../../src/State.hpp \
../../../../src/states/MenuState.cpp \ ../../../../src/states/MenuState.cpp \
../../../../src/states/MenuState.hpp \ ../../../../src/states/MenuState.hpp \
../../../../src/states/TestState.cpp \
../../../../src/states/TestState.hpp \
../../../../src/main.cpp ../../../../src/main.cpp
LOCAL_SHARED_LIBRARIES := SDL2 LOCAL_SHARED_LIBRARIES := SDL2

6
build/ios/Roll them Bones.xcodeproj/project.pbxproj
View File

@ -40,6 +40,7 @@
20F7466A1AA27B8C00F5846A /* AssetCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F746651AA27B8C00F5846A /* AssetCache.cpp */; }; 20F7466A1AA27B8C00F5846A /* AssetCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F746651AA27B8C00F5846A /* AssetCache.cpp */; };
20F7466B1AA27B8C00F5846A /* AssetManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F746671AA27B8C00F5846A /* AssetManager.cpp */; }; 20F7466B1AA27B8C00F5846A /* AssetManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F746671AA27B8C00F5846A /* AssetManager.cpp */; };
20FC42201AA460960083B64C /* MenuState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20FC421E1AA460960083B64C /* MenuState.cpp */; }; 20FC42201AA460960083B64C /* MenuState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20FC421E1AA460960083B64C /* MenuState.cpp */; };
20FC425D1AA56A150083B64C /* TestState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20FC425B1AA56A150083B64C /* TestState.cpp */; };
20FD2D3B1A67470A00B32F7B /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20FD2D3A1A67470A00B32F7B /* main.cpp */; }; 20FD2D3B1A67470A00B32F7B /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20FD2D3A1A67470A00B32F7B /* main.cpp */; };
28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; }; 28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; };
28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; }; 28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; };
@ -187,6 +188,8 @@
20FC421E1AA460960083B64C /* MenuState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MenuState.cpp; path = ../../src/states/MenuState.cpp; sourceTree = SOURCE_ROOT; }; 20FC421E1AA460960083B64C /* MenuState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MenuState.cpp; path = ../../src/states/MenuState.cpp; sourceTree = SOURCE_ROOT; };
20FC421F1AA460960083B64C /* MenuState.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = MenuState.hpp; path = ../../src/states/MenuState.hpp; sourceTree = SOURCE_ROOT; }; 20FC421F1AA460960083B64C /* MenuState.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = MenuState.hpp; path = ../../src/states/MenuState.hpp; sourceTree = SOURCE_ROOT; };
20FC42231AA460BC0083B64C /* State.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = State.hpp; path = ../../src/State.hpp; sourceTree = SOURCE_ROOT; }; 20FC42231AA460BC0083B64C /* State.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = State.hpp; path = ../../src/State.hpp; sourceTree = SOURCE_ROOT; };
20FC425B1AA56A150083B64C /* TestState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TestState.cpp; path = ../../src/states/TestState.cpp; sourceTree = SOURCE_ROOT; };
20FC425C1AA56A150083B64C /* TestState.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = TestState.hpp; path = ../../src/states/TestState.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; }; 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; }; 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; }; 28FD15070DC6FC5B0079059D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
@ -389,6 +392,8 @@
20FC421D1AA4607B0083B64C /* States */ = { 20FC421D1AA4607B0083B64C /* States */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
20FC425B1AA56A150083B64C /* TestState.cpp */,
20FC425C1AA56A150083B64C /* TestState.hpp */,
20FC421E1AA460960083B64C /* MenuState.cpp */, 20FC421E1AA460960083B64C /* MenuState.cpp */,
20FC421F1AA460960083B64C /* MenuState.hpp */, 20FC421F1AA460960083B64C /* MenuState.hpp */,
); );
@ -534,6 +539,7 @@
20F7466A1AA27B8C00F5846A /* AssetCache.cpp in Sources */, 20F7466A1AA27B8C00F5846A /* AssetCache.cpp in Sources */,
20F7466B1AA27B8C00F5846A /* AssetManager.cpp in Sources */, 20F7466B1AA27B8C00F5846A /* AssetManager.cpp in Sources */,
20FC42201AA460960083B64C /* MenuState.cpp in Sources */, 20FC42201AA460960083B64C /* MenuState.cpp in Sources */,
20FC425D1AA56A150083B64C /* TestState.cpp in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };

6
build/osx/Roll them Bones.xcodeproj/project.pbxproj
View File

@ -39,6 +39,7 @@
20E3F2951A8CE8470071FD41 /* Mesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20E3F2921A8CE8470071FD41 /* Mesh.cpp */; }; 20E3F2951A8CE8470071FD41 /* Mesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20E3F2921A8CE8470071FD41 /* Mesh.cpp */; };
20F746501AA1DE0F00F5846A /* AssetCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F7464E1AA1DE0F00F5846A /* AssetCache.cpp */; }; 20F746501AA1DE0F00F5846A /* AssetCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F7464E1AA1DE0F00F5846A /* AssetCache.cpp */; };
20FC41F11AA45D880083B64C /* MenuState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20FC41EF1AA45D880083B64C /* MenuState.cpp */; }; 20FC41F11AA45D880083B64C /* MenuState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20FC41EF1AA45D880083B64C /* MenuState.cpp */; };
20FC42581AA569FB0083B64C /* TestState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20FC42561AA569FB0083B64C /* TestState.cpp */; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
@ -121,6 +122,8 @@
20F746731AA325C000F5846A /* HashTable.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = HashTable.hpp; path = ../../src/HashTable.hpp; sourceTree = SOURCE_ROOT; }; 20F746731AA325C000F5846A /* HashTable.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = HashTable.hpp; path = ../../src/HashTable.hpp; sourceTree = SOURCE_ROOT; };
20FC41EF1AA45D880083B64C /* MenuState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MenuState.cpp; path = ../../src/states/MenuState.cpp; sourceTree = SOURCE_ROOT; }; 20FC41EF1AA45D880083B64C /* MenuState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MenuState.cpp; path = ../../src/states/MenuState.cpp; sourceTree = SOURCE_ROOT; };
20FC41F01AA45D880083B64C /* MenuState.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = MenuState.hpp; path = ../../src/states/MenuState.hpp; sourceTree = SOURCE_ROOT; }; 20FC41F01AA45D880083B64C /* MenuState.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = MenuState.hpp; path = ../../src/states/MenuState.hpp; sourceTree = SOURCE_ROOT; };
20FC42561AA569FB0083B64C /* TestState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TestState.cpp; path = ../../src/states/TestState.cpp; sourceTree = SOURCE_ROOT; };
20FC42571AA569FB0083B64C /* TestState.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = TestState.hpp; path = ../../src/states/TestState.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; }; 8D1107320486CEB800E47090 /* Roll them Bones.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Roll them Bones.app"; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */ /* End PBXFileReference section */
@ -257,6 +260,8 @@
20FC41ED1AA45D650083B64C /* States */ = { 20FC41ED1AA45D650083B64C /* States */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
20FC42561AA569FB0083B64C /* TestState.cpp */,
20FC42571AA569FB0083B64C /* TestState.hpp */,
20FC41EF1AA45D880083B64C /* MenuState.cpp */, 20FC41EF1AA45D880083B64C /* MenuState.cpp */,
20FC41F01AA45D880083B64C /* MenuState.hpp */, 20FC41F01AA45D880083B64C /* MenuState.hpp */,
); );
@ -392,6 +397,7 @@
205183CC1A9F330000DE49E9 /* Asset.cpp in Sources */, 205183CC1A9F330000DE49E9 /* Asset.cpp in Sources */,
20F746501AA1DE0F00F5846A /* AssetCache.cpp in Sources */, 20F746501AA1DE0F00F5846A /* AssetCache.cpp in Sources */,
20FC41F11AA45D880083B64C /* MenuState.cpp in Sources */, 20FC41F11AA45D880083B64C /* MenuState.cpp in Sources */,
20FC42581AA569FB0083B64C /* TestState.cpp in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };