Merge pull request #3955 from dumganhar/iss2905-folder-structure

issue #2905: [iOS Mac] HelloLua and TestLua work now.

build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-c574341d56f31ced16553735ba34a697d1bbac02
+97bf8ff69bab6a8a85dc80aca3938ca96cbfe2e5

build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-a4c6fec549057de458346127f489e6e6bea2f0d1
+d25068403b84374432b0ddaec0ab9c1e3a38c4ec

cocos/scripting/lua/bindings/CCBProxy.h

@@ -5,9 +5,12 @@
 #include "CCLuaEngine.h"
 #include "SimpleAudioEngine.h"
 #include "cocos-ext.h"
+#include "cocosbuilder/CocosBuilder.h"
 
 USING_NS_CC;
 USING_NS_CC_EXT;
+using namespace cocosbuilder;
+
 
 class CCBProxy : public Layer{
 public:

cocos/scripting/lua/bindings/CCLuaEngine.cpp

@@ -24,10 +24,10 @@
 
 #include "CCLuaEngine.h"
 #include "cocos2d.h"
-#include "cocoa/CCArray.h"
+#include "CCArray.h"
 #include "CCScheduler.h"
 #include "LuaScriptHandlerMgr.h"
-#include "GUI/CCControlExtension/CCControl.h"
+#include "extensions/GUI/CCControlExtension/CCControl.h"
 #include "LuaOpengl.h"
 #include "lua_cocos2dx_extension_manual.h"
 

cocos/scripting/lua/bindings/CCLuaEngine.h

@@ -30,11 +30,11 @@ extern "C" {
 }
 
 #include "ccTypes.h"
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
-#include "event_dispatcher/CCTouch.h"
+#include "CCTouch.h"
-#include "cocoa/CCSet.h"
+#include "CCSet.h"
-#include "base_nodes/CCNode.h"
+#include "CCNode.h"
-#include "script_support/CCScriptSupport.h"
+#include "CCScriptSupport.h"
 #include "CCLuaStack.h"
 #include "CCLuaValue.h"
 

cocos/scripting/lua/bindings/CCLuaStack.h

@@ -30,7 +30,7 @@ extern "C" {
 }
 
 #include "ccTypes.h"
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
 #include "CCLuaValue.h"
 
 NS_CC_BEGIN

cocos/scripting/lua/bindings/CCLuaValue.h

@@ -34,7 +34,7 @@ extern "C" {
 }
 
 #include "ccTypes.h"
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
 
 #if CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY
 using std::memset;

cocos/scripting/lua/bindings/LuaOpengl.h

@@ -9,7 +9,8 @@ extern "C" {
 }
 #endif
 
-#include "base_nodes/CCNode.h"
+#include "CCNode.h"
+
 class GLNode:public cocos2d::Node
 {
     virtual void draw();

cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h

@@ -7,9 +7,9 @@ extern "C" {
 }
 
 
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
 #include "ccMacros.h"
-#include "actions/CCActionInstant.h"
+#include "CCActionInstant.h"
 #include <vector>
 #include <map>
 

cocos/scripting/lua/bindings/Lua_web_socket.cpp

@@ -19,7 +19,6 @@ extern "C" {
 #include "LuaScriptHandlerMgr.h"
 
 using namespace cocos2d;
-using namespace cocos2d::extension;
 
 
 static int SendBinaryMessageToLua(int nHandler,const unsigned char* pTable,int nLength)

cocos/scripting/lua/bindings/Lua_web_socket.h

@@ -12,7 +12,7 @@ extern "C" {
 #endif
 
 #include "network/WebSocket.h"
-class LuaWebSocket: public cocos2d::extension::WebSocket,public cocos2d::extension::WebSocket::Delegate
+class LuaWebSocket: public network::WebSocket,public network::WebSocket::Delegate
 {
 public:
     virtual ~LuaWebSocket();

cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp

@@ -13,9 +13,11 @@ extern "C" {
 #include "CCLuaValue.h"
 #include "cocos-ext.h"
 #include "CCBProxy.h"
+#include "cocostudio/CocoStudio.h"
 
 USING_NS_CC;
 USING_NS_CC_EXT;
+using namespace cocostudio;
 
 class LuaScrollViewDelegate:public Object, public ScrollViewDelegate
 {
@@ -1334,14 +1336,14 @@ static int lua_cocos2dx_extension_Bone_setIgnoreMovementBoneData(lua_State* L)
         return 0;
     
     int argc = 0;
-    armature::Bone* self = nullptr;
+    cocostudio::Bone* self = nullptr;
     
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 	if (!tolua_isusertype(L,1,"Bone",0,&tolua_err)) goto tolua_lerror;
 #endif
     
-    self = static_cast<armature::Bone*>(tolua_tousertype(L,1,0));
+    self = static_cast<cocostudio::Bone*>(tolua_tousertype(L,1,0));
     
 #if COCOS2D_DEBUG >= 1
 	if (nullptr == self) {
@@ -1379,14 +1381,14 @@ static int lua_cocos2dx_extension_Bone_getIgnoreMovementBoneData(lua_State* L)
         return 0;
     
     int argc = 0;
-    armature::Bone* self = nullptr;
+    cocostudio::Bone* self = nullptr;
     
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 	if (!tolua_isusertype(L,1,"Bone",0,&tolua_err)) goto tolua_lerror;
 #endif
     
-    self = static_cast<armature::Bone*>(tolua_tousertype(L,1,0));
+    self = static_cast<cocostudio::Bone*>(tolua_tousertype(L,1,0));
     
 #if COCOS2D_DEBUG >= 1
 	if (nullptr == self) {

cocos/scripting/lua/proj.ios/luabindings-Prefix.pch

@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'luabindings' target in the 'luabindings' project
-//
-
-#ifdef __OBJC__
-    #import <Foundation/Foundation.h>
-#endif