mirror of https://github.com/axmolengine/axmol.git
Merge pull request #9010 from ricardoquesada/treat_warnings_as_errors_in_samples
treat warnings as errors in samples
This commit is contained in:
commit
a95f689842
|
@ -7231,7 +7231,6 @@
|
||||||
CC_KEYBOARD_SUPPORT,
|
CC_KEYBOARD_SUPPORT,
|
||||||
_USRDLL,
|
_USRDLL,
|
||||||
);
|
);
|
||||||
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
|
|
||||||
HEADER_SEARCH_PATHS = "";
|
HEADER_SEARCH_PATHS = "";
|
||||||
LD_DYLIB_INSTALL_NAME = "";
|
LD_DYLIB_INSTALL_NAME = "";
|
||||||
LIBRARY_SEARCH_PATHS = (
|
LIBRARY_SEARCH_PATHS = (
|
||||||
|
@ -7266,7 +7265,6 @@
|
||||||
CC_TARGET_OS_MAC,
|
CC_TARGET_OS_MAC,
|
||||||
_USRDLL,
|
_USRDLL,
|
||||||
);
|
);
|
||||||
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
|
|
||||||
HEADER_SEARCH_PATHS = "";
|
HEADER_SEARCH_PATHS = "";
|
||||||
LD_DYLIB_INSTALL_NAME = "";
|
LD_DYLIB_INSTALL_NAME = "";
|
||||||
LIBRARY_SEARCH_PATHS = (
|
LIBRARY_SEARCH_PATHS = (
|
||||||
|
@ -7296,7 +7294,6 @@
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
CC_TARGET_OS_IPHONE,
|
CC_TARGET_OS_IPHONE,
|
||||||
);
|
);
|
||||||
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
|
|
||||||
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
|
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
|
||||||
HEADER_SEARCH_PATHS = "";
|
HEADER_SEARCH_PATHS = "";
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
|
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
|
||||||
|
@ -7329,7 +7326,6 @@
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
CC_TARGET_OS_IPHONE,
|
CC_TARGET_OS_IPHONE,
|
||||||
);
|
);
|
||||||
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
|
|
||||||
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
|
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
|
||||||
HEADER_SEARCH_PATHS = "";
|
HEADER_SEARCH_PATHS = "";
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
|
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
|
||||||
|
|
|
@ -5706,6 +5706,7 @@
|
||||||
"CC_ENABLE_CHIPMUNK_INTEGRATION=1",
|
"CC_ENABLE_CHIPMUNK_INTEGRATION=1",
|
||||||
);
|
);
|
||||||
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
|
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
|
||||||
|
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
|
||||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||||
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
|
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
|
||||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||||
|
@ -5733,6 +5734,7 @@
|
||||||
"CC_ENABLE_CHIPMUNK_INTEGRATION=1",
|
"CC_ENABLE_CHIPMUNK_INTEGRATION=1",
|
||||||
);
|
);
|
||||||
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
|
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
|
||||||
|
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
|
||||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||||
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
|
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
|
||||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||||
|
|
|
@ -470,9 +470,9 @@ bool EffectNormalMapped::init()
|
||||||
_kBump = 2;
|
_kBump = 2;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
bool EffectNormalMapped::initNormalMap(const std::string&normalMapFileName)
|
bool EffectNormalMapped::initNormalMap(const std::string& normalMapFileName)
|
||||||
{
|
{
|
||||||
auto normalMapTextrue = TextureCache::getInstance()->addImage(normalMapFileName.c_str());
|
auto normalMapTextrue = Director::getInstance()->getTextureCache()->addImage(normalMapFileName);
|
||||||
getGLProgramState()->setUniformTexture("u_normalMap", normalMapTextrue);
|
getGLProgramState()->setUniformTexture("u_normalMap", normalMapTextrue);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
+ (int) addTwoNumbers:(NSDictionary *)dict;
|
+ (int) addTwoNumbers:(NSDictionary *)dict;
|
||||||
+ (void) callbackScriptHandler;
|
+ (void) callbackScriptHandler;
|
||||||
|
|
||||||
- (void) init;
|
- (id) init;
|
||||||
@end
|
@end
|
||||||
|
|
||||||
#endif // COCOS2DX_SAMPLES_TESTLUA_PROJ_IOS_LUAOBJECTCBRIDGETEST_H
|
#endif // COCOS2DX_SAMPLES_TESTLUA_PROJ_IOS_LUAOBJECTCBRIDGETEST_H
|
||||||
|
|
|
@ -73,9 +73,10 @@ static LuaObjectCBridgeTest* s_instance = nil;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)init
|
- (id)init
|
||||||
{
|
{
|
||||||
_scriptHandler = 0;
|
_scriptHandler = 0;
|
||||||
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
Loading…
Reference in New Issue