Merge pull request #2149 from fape/jsb_update

Rename cocos2dx.hpp to jsb_cocos2dx_auto.hpp in AssetsManagerTest and CocosPlayer
This commit is contained in:
minggo 2013-03-12 19:28:16 -07:00
commit 2a9cde6af6
2 changed files with 2 additions and 2 deletions

View File

@ -8,7 +8,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "SimpleAudioEngine.h" #include "SimpleAudioEngine.h"
#include "ScriptingCore.h" #include "ScriptingCore.h"
#include "generated/cocos2dx.hpp" #include "generated/jsb_cocos2dx_auto.hpp"
#include "cocos2d_specifics.hpp" #include "cocos2d_specifics.hpp"
#include "js_bindings_chipmunk_registration.h" #include "js_bindings_chipmunk_registration.h"
#include "js_bindings_system_registration.h" #include "js_bindings_system_registration.h"

View File

@ -3,7 +3,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "SimpleAudioEngine.h" #include "SimpleAudioEngine.h"
#include "ScriptingCore.h" #include "ScriptingCore.h"
#include "generated/cocos2dx.hpp" #include "generated/jsb_cocos2dx_auto.hpp"
#include "cocos2d_specifics.hpp" #include "cocos2d_specifics.hpp"
#include "js_bindings_chipmunk_registration.h" #include "js_bindings_chipmunk_registration.h"
#include "js_bindings_ccbreader.h" #include "js_bindings_ccbreader.h"