Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14816 from ricardoquesada/tvos_fixes 

fixes compilation issues on tvOS
This commit is contained in:
Ricardo Quesada 2015-12-29 12:58:45 -08:00
parent 3a3bf8da0f 77aa3871b6
commit 9c7edc09f4
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/cocos2d_libs.xcodeproj/project.pbxproj
View File

@ -16563,7 +16563,6 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
COPY_PHASE_STRIP = NO;
ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_DYNAMIC_NO_PIC = NO;
@ -16601,7 +16600,6 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
ENABLE_BITCODE = NO;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_PREPROCESSOR_DEFINITIONS = (
"CC_ENABLE_CHIPMUNK_INTEGRATION=1",
@ -16633,7 +16631,6 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
COMBINE_HIDPI_IMAGES = YES;
ENABLE_BITCODE = NO;
EXECUTABLE_EXTENSION = a;
EXECUTABLE_PREFIX = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@ -16670,7 +16667,6 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
COMBINE_HIDPI_IMAGES = YES;
ENABLE_BITCODE = NO;
EXECUTABLE_EXTENSION = a;
EXECUTABLE_PREFIX = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@ -16770,6 +16766,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ENABLE_BITCODE = NO;
EXECUTABLE_PREFIX = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "../cocos/platform/ios/cocos2d-prefix.pch";
@ -16802,6 +16799,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ENABLE_BITCODE = NO;
EXECUTABLE_PREFIX = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;

19
build/cocos2d_tests.xcodeproj/project.pbxproj
View File

@ -5715,9 +5715,21 @@
1D6058900D05DD3D006BFB54 = {
DevelopmentTeam = U7E7529TA5;
};
507B40FE1C31BEA60067B53E = {
DevelopmentTeam = MDDB52YB8L;
};
507B427E1C31E6070067B53E = {
DevelopmentTeam = MDDB52YB8L;
};
507B43541C31FB340067B53E = {
CreatedOnToolsVersion = 7.2;
};
507B43611C31FB670067B53E = {
DevelopmentTeam = MDDB52YB8L;
};
507B43C31C3201360067B53E = {
DevelopmentTeam = MDDB52YB8L;
};
};
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "cocos2d_tests" */;
@ -8361,8 +8373,6 @@
507B43B71C31FB670067B53E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
ENABLE_BITCODE = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_TVOS,
@ -8384,8 +8394,6 @@
507B43B81C31FB670067B53E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
ENABLE_BITCODE = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_TVOS,
@ -8408,7 +8416,6 @@
507B43F01C3201360067B53E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_TVOS,
@ -8425,7 +8432,6 @@
507B43F11C3201360067B53E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_TVOS,
@ -8806,6 +8812,7 @@
507B435A1C31FB350067B53E /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
507B43B61C31FB670067B53E /* Build configuration list for PBXNativeTarget "lua-tests tvOS" */ = {
isa = XCConfigurationList;

2
cocos/audio/ios/CDAudioManager.m
View File

@ -491,7 +491,7 @@ static BOOL configured = FALSE;
//determine ringer switch state
-(BOOL) isDeviceMuted {
#if TARGET_IPHONE_SIMULATOR
#if TARGET_IPHONE_SIMULATOR || defined(CC_TARGET_OS_TVOS)
//Calling audio route stuff on the simulator causes problems
return NO;
#else