From fc3a55a0656d5d57bf7e523f2b7806ff0472650a Mon Sep 17 00:00:00 2001 From: YuLei Date: Tue, 11 Sep 2012 15:44:33 +0800 Subject: [PATCH] [Lua] move LUA_FUNCTION, LUA_TABLE, LUA_STRING declare to CCLuaEngine.h --- cocos2dx/script_support/CCScriptSupport.h | 4 ---- scripting/lua/cocos2dx_support/CCLuaEngine.h | 4 ++++ scripting/lua/cocos2dx_support/LuaCocos2d.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cocos2dx/script_support/CCScriptSupport.h b/cocos2dx/script_support/CCScriptSupport.h index 5fd2a042f9..7c32e7167e 100644 --- a/cocos2dx/script_support/CCScriptSupport.h +++ b/cocos2dx/script_support/CCScriptSupport.h @@ -48,10 +48,6 @@ enum ccScriptType { kScriptTypeJavascript }; -typedef int LUA_FUNCTION; -typedef int LUA_TABLE; -typedef int LUA_STRING; - // #pragma mark - // #pragma mark CCScriptHandlerEntry diff --git a/scripting/lua/cocos2dx_support/CCLuaEngine.h b/scripting/lua/cocos2dx_support/CCLuaEngine.h index e394557bae..be674cb1ac 100644 --- a/scripting/lua/cocos2dx_support/CCLuaEngine.h +++ b/scripting/lua/cocos2dx_support/CCLuaEngine.h @@ -38,6 +38,10 @@ extern "C" { NS_CC_BEGIN +typedef int LUA_FUNCTION; +typedef int LUA_TABLE; +typedef int LUA_STRING; + class CCLuaValue; typedef std::map CCLuaValueDict; diff --git a/scripting/lua/cocos2dx_support/LuaCocos2d.h b/scripting/lua/cocos2dx_support/LuaCocos2d.h index d2ae667a91..cd93204279 100644 --- a/scripting/lua/cocos2dx_support/LuaCocos2d.h +++ b/scripting/lua/cocos2dx_support/LuaCocos2d.h @@ -11,6 +11,7 @@ extern "C" { #include #include "tolua_fix.h" #include "cocos2d.h" +#include "CCLuaEngine.h" #include "SimpleAudioEngine.h" using namespace cocos2d;