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

Updating cocos2dx.ini(adding CCScheduler to 'abstract_class' section) and adding ScriptingCore::getGlobalObject method.

This commit is contained in:
James Chen 2013-03-12 22:03:37 +08:00
parent 2be1347dc7
commit 3aaf5cabdb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripting/javascript/bindings/ScriptingCore.h
View File

@ -200,7 +200,8 @@ public:
void debugProcessInput(string str); void debugProcessInput(string str);
void enableDebugger(); void enableDebugger();
JSObject* getDebugGlobal() { return debugGlobal_; } JSObject* getDebugGlobal() { return debugGlobal_; }
JSObject* getGlobalObject() { return global_; }
private: private:
void string_report(jsval val); void string_report(jsval val);
}; };

2
tools/tojs/cocos2dx.ini
View File

@ -134,7 +134,7 @@ base_classes_to_skip = CCObject
# classes that create no constructor # classes that create no constructor
# CCSet is special and we will use a hand-written constructor # CCSet is special and we will use a hand-written constructor
abstract_classes = CCDirector CCSpriteFrameCache CCTransitionEaseScene CCSet SimpleAudioEngine CCFileUtils abstract_classes = CCDirector CCSpriteFrameCache CCTransitionEaseScene CCSet SimpleAudioEngine CCFileUtils CCScheduler
# Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'. # Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'.
script_control_cpp = no script_control_cpp = no