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

fix lua compile issue

This commit is contained in:
halx99 2020-08-04 22:38:57 +08:00
parent ce9fb1c42c
commit 205d6e5fb9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/base/ccConfig.h
View File

@ -309,9 +309,9 @@ THE SOFTWARE.
#define CC_USE_WEBP 1 #define CC_USE_WEBP 1
#endif // CC_USE_WEBP #endif // CC_USE_WEBP
/** Enable Script binding. v4 or engine-x already remove js, leave follow always 0 */ /** Enable Lua Script binding */
#ifndef CC_ENABLE_SCRIPT_BINDING #ifndef CC_ENABLE_SCRIPT_BINDING
#define CC_ENABLE_SCRIPT_BINDING 0 #define CC_ENABLE_SCRIPT_BINDING 1
#endif #endif
/** When CC_ENABLE_SCRIPT_BINDING and CC_ENABLE_GC_FOR_NATIVE_OBJECTS are both 1 /** When CC_ENABLE_SCRIPT_BINDING and CC_ENABLE_GC_FOR_NATIVE_OBJECTS are both 1

8
extensions/fairygui/display/FUIContainer.cpp
View File

@ -211,7 +211,7 @@ void FUIContainer::setInverted(bool inverted)
void FUIContainer::onEnter() void FUIContainer::onEnter()
{ {
#if CC_ENABLE_SCRIPT_BINDING #if CC_ENABLE_SCRIPT_BINDING && COCOS2D_VERSION < 0x00040000
if (_scriptType == kScriptTypeJavascript) if (_scriptType == kScriptTypeJavascript)
{ {
if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnEnter)) if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnEnter))
@ -230,7 +230,7 @@ void FUIContainer::onEnter()
void FUIContainer::onEnterTransitionDidFinish() void FUIContainer::onEnterTransitionDidFinish()
{ {
#if CC_ENABLE_SCRIPT_BINDING #if CC_ENABLE_SCRIPT_BINDING && COCOS2D_VERSION < 0x00040000
if (_scriptType == kScriptTypeJavascript) if (_scriptType == kScriptTypeJavascript)
{ {
if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnEnterTransitionDidFinish)) if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnEnterTransitionDidFinish))
@ -248,7 +248,7 @@ void FUIContainer::onEnterTransitionDidFinish()
void FUIContainer::onExitTransitionDidStart() void FUIContainer::onExitTransitionDidStart()
{ {
#if CC_ENABLE_SCRIPT_BINDING #if CC_ENABLE_SCRIPT_BINDING && COCOS2D_VERSION < 0x00040000
if (_scriptType == kScriptTypeJavascript) if (_scriptType == kScriptTypeJavascript)
{ {
if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnExitTransitionDidStart)) if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnExitTransitionDidStart))
@ -263,7 +263,7 @@ void FUIContainer::onExitTransitionDidStart()
void FUIContainer::onExit() void FUIContainer::onExit()
{ {
#if CC_ENABLE_SCRIPT_BINDING #if CC_ENABLE_SCRIPT_BINDING && COCOS2D_VERSION < 0x00040000
if (_scriptType == kScriptTypeJavascript) if (_scriptType == kScriptTypeJavascript)
{ {
if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnExit)) if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnExit))