diff --git a/HelloLua/win32/HelloLua.win32.vcproj b/HelloLua/win32/HelloLua.win32.vcproj
index fb88b16c44..3337a2614b 100644
--- a/HelloLua/win32/HelloLua.win32.vcproj
+++ b/HelloLua/win32/HelloLua.win32.vcproj
@@ -49,8 +49,8 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Disabled
- ..\Classes;$(SolutionDir)\lua\cocos2dx_support;$(SolutionDir)\lua\tolua;$(SolutionDir)\lua\src;.;$(SolutionDir)\cocos2dx;$(SolutionDir)\cocos2dx\include;$(SolutionDir)\cocos2dx\platform;$(SolutionDir)\cocos2dx\platform\third_party\win32\OGLES;$(SolutionDir)\CocosDenshion\Include;%(AdditionalIncludeDirectories)
+ ..\Classes;$(SolutionDir)\lua\cocos2dx_support;$(SolutionDir)\lua\lua;$(SolutionDir)\lua\tolua;.;$(SolutionDir)\cocos2dx;$(SolutionDir)\cocos2dx\include;$(SolutionDir)\cocos2dx\platform;$(SolutionDir)\cocos2dx\platform\third_party\win32\OGLES;$(SolutionDir)\CocosDenshion\Include;%(AdditionalIncludeDirectories)
WIN32;_WINDOWS;STRICT;_DEBUG;COCOS2D_DEBUG=1;ENABLE_LUA;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -102,7 +102,7 @@
HelloLua_p.c
- ..\Classes;$(SolutionDir)\lua\cocos2dx_support;$(SolutionDir)\lua\tolua;$(SolutionDir)\lua\src;.;$(SolutionDir)\cocos2dx;$(SolutionDir)\cocos2dx\include;$(SolutionDir)\cocos2dx\platform;$(SolutionDir)\cocos2dx\platform\third_party\win32\OGLES;$(SolutionDir)\CocosDenshion\Include;%(AdditionalIncludeDirectories)
+ ..\Classes;$(SolutionDir)\lua\cocos2dx_support;$(SolutionDir)\lua\lua;$(SolutionDir)\lua\tolua;$(SolutionDir)\lua\src;.;$(SolutionDir)\cocos2dx;$(SolutionDir)\cocos2dx\include;$(SolutionDir)\cocos2dx\platform;$(SolutionDir)\cocos2dx\platform\third_party\win32\OGLES;$(SolutionDir)\CocosDenshion\Include;%(AdditionalIncludeDirectories)
WIN32;_WINDOWS;STRICT;NDEBUG;%(PreprocessorDefinitions)
@@ -127,10 +127,16 @@
+
+
+
+
+
+
diff --git a/HelloLua/win32/HelloLua.win32.vcxproj.filters b/HelloLua/win32/HelloLua.win32.vcxproj.filters
index 2c5b872d56..5618954f1c 100644
--- a/HelloLua/win32/HelloLua.win32.vcxproj.filters
+++ b/HelloLua/win32/HelloLua.win32.vcxproj.filters
@@ -7,6 +7,9 @@
{ce400533-5bf6-41a7-8d1a-59e2de196b8e}
+
+ {0421f3bc-da65-4d23-900a-f62683dfa470}
+
@@ -15,6 +18,15 @@
win32
+
+ Classes\cocos2dx_support
+
+
+ Classes\cocos2dx_support
+
+
+ Classes\cocos2dx_support
+
@@ -23,5 +35,14 @@
win32
+
+ Classes\cocos2dx_support
+
+
+ Classes\cocos2dx_support
+
+
+ Classes\cocos2dx_support
+
\ No newline at end of file
diff --git a/cocos2d-win32.vc2008.sln b/cocos2d-win32.vc2008.sln
index 7d6f5bf630..46a8320a92 100644
--- a/cocos2d-win32.vc2008.sln
+++ b/cocos2d-win32.vc2008.sln
@@ -29,9 +29,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua\win32\
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "lua\proj.win32\liblua.vcproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}"
- ProjectSection(ProjectDependencies) = postProject
- {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
- EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/cocos2d-win32.vc2010.sln b/cocos2d-win32.vc2010.sln
index 3dd3612af4..58279f7cfe 100644
--- a/cocos2d-win32.vc2010.sln
+++ b/cocos2d-win32.vc2010.sln
@@ -16,9 +16,6 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua\win32\HelloLua.win32.vcxproj", "{13E55395-94A2-4CD9-BFC2-1A051F80C17D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "lua\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}"
- ProjectSection(ProjectDependencies) = postProject
- {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
- EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/cocos2dx/include/CCScriptSupport.h b/cocos2dx/include/CCScriptSupport.h
index bc495d6daf..f2174c33dc 100644
--- a/cocos2dx/include/CCScriptSupport.h
+++ b/cocos2dx/include/CCScriptSupport.h
@@ -44,6 +44,8 @@ NS_CC_BEGIN;
class CC_DLL CCScriptEngineProtocol
{
public:
+ CCScriptEngineProtocol();
+
// functions for excute touch event
virtual bool executeTouchEvent(const char *pszFuncName, CCTouch *pTouch) = 0;
virtual bool executeTouchesEvent(const char *pszFuncName, CCSet *pTouches) = 0;
diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcxproj b/cocos2dx/proj.win32/cocos2d-win32.vcxproj
index 68999b1f38..54c212b5b3 100644
--- a/cocos2dx/proj.win32/cocos2d-win32.vcxproj
+++ b/cocos2dx/proj.win32/cocos2d-win32.vcxproj
@@ -195,10 +195,10 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
-
+
@@ -291,6 +291,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
+
diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters b/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
index fa4ebeb58b..1143a13952 100644
--- a/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
+++ b/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
@@ -276,9 +276,6 @@
support\zip_support
-
- textures
-
textures
@@ -333,6 +330,9 @@
+
+ textures
+
@@ -687,5 +687,8 @@
touch_dispatcher
+
+ include
+
\ No newline at end of file
diff --git a/cocos2dx/script_support/CCScriptSupport.cpp b/cocos2dx/script_support/CCScriptSupport.cpp
index 6e4a819149..9e57310cbd 100644
--- a/cocos2dx/script_support/CCScriptSupport.cpp
+++ b/cocos2dx/script_support/CCScriptSupport.cpp
@@ -25,6 +25,8 @@ THE SOFTWARE.
NS_CC_BEGIN;
+CCScriptEngineProtocol::CCScriptEngineProtocol() {}
+
CCScriptEngineManager::CCScriptEngineManager()
:m_pScriptEngine(NULL)
{
diff --git a/lua/cocos2dx_support/LuaEngine.h b/lua/cocos2dx_support/LuaEngine.h
index 92f11ac236..14c2ecd76b 100644
--- a/lua/cocos2dx_support/LuaEngine.h
+++ b/lua/cocos2dx_support/LuaEngine.h
@@ -27,25 +27,9 @@ THE SOFTWARE.
#include "CCScriptSupport.h"
#include "cocos2d.h"
-#ifdef _WINDOWS
-
-#undef LUA_DLL
-
-#if defined(_USRDLL)
- #define LUA_DLL __declspec(dllexport)
-#else /* use a DLL library */
- #define LUA_DLL __declspec(dllimport)
-#endif
-
-#else
- #define LUA_DLL
-
-#endif // CC_PLATFORM_WIN32
-
-class LUA_DLL LuaEngine : public cocos2d::CCScriptEngineProtocol
+class LuaEngine : public cocos2d::CCScriptEngineProtocol
{
public:
-
// functions for excute touch event
virtual bool executeTouchEvent(const char *pszFuncName, cocos2d::CCTouch *pTouch);
virtual bool executeTouchesEvent(const char *pszFuncName, cocos2d::CCSet *pTouches);
diff --git a/lua/proj.win32/liblua.vcproj b/lua/proj.win32/liblua.vcproj
index 3fe272920e..077df1b941 100644
--- a/lua/proj.win32/liblua.vcproj
+++ b/lua/proj.win32/liblua.vcproj
@@ -19,8 +19,8 @@
-
@@ -86,9 +78,6 @@
-
@@ -96,8 +85,8 @@
@@ -120,7 +109,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(SolutionDir)\lua\tolua";"$(SolutionDir)\lua\lua";"$(SolutionDir)\cocos2dx\platform\third_party\win32\OGLES";"$(SolutionDir)\cocos2dx\platform";"$(SolutionDir)\cocos2dx\include";"$(SolutionDir)\cocos2dx""
+ AdditionalIncludeDirectories=""$(SolutionDir)\lua\tolua";"$(SolutionDir)\lua\lua""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBLUA_EXPORTS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -141,22 +130,12 @@
Name="VCPreLinkEventTool"
/>
-
@@ -166,9 +145,6 @@
-
@@ -401,34 +377,6 @@
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lua/proj.win32/liblua.vcxproj b/lua/proj.win32/liblua.vcxproj
index 9d22a2775a..434ce850c7 100644
--- a/lua/proj.win32/liblua.vcxproj
+++ b/lua/proj.win32/liblua.vcxproj
@@ -17,12 +17,12 @@
- DynamicLibrary
+ StaticLibrary
Unicode
true
- DynamicLibrary
+ StaticLibrary
Unicode
@@ -53,7 +53,7 @@
Disabled
- $(SolutionDir)\lua\tolua;$(SolutionDir)\lua\lua;$(SolutionDir)\cocos2dx\platform\third_party\win32\OGLES;$(SolutionDir)\cocos2dx\platform;$(SolutionDir)\cocos2dx\include;$(SolutionDir)\cocos2dx;%(AdditionalIncludeDirectories)
+ $(SolutionDir)\lua\tolua;$(SolutionDir)\lua\lua;%(AdditionalIncludeDirectories)
WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -80,7 +80,7 @@
MaxSpeed
true
- $(SolutionDir)\lua\tolua;$(SolutionDir)\lua\lua;$(SolutionDir)\cocos2dx\platform\third_party\win32\OGLES;$(SolutionDir)\cocos2dx\platform;$(SolutionDir)\cocos2dx\include;$(SolutionDir)\cocos2dx;%(AdditionalIncludeDirectories)
+ $(SolutionDir)\lua\tolua;$(SolutionDir)\lua\lua;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBLUA_EXPORTS;%(PreprocessorDefinitions)
MultiThreadedDLL
true
@@ -137,9 +137,6 @@
-
-
-
@@ -170,9 +167,6 @@
-
-
-
diff --git a/lua/proj.win32/liblua.vcxproj.filters b/lua/proj.win32/liblua.vcxproj.filters
index 72755f3491..68078ef7d9 100644
--- a/lua/proj.win32/liblua.vcxproj.filters
+++ b/lua/proj.win32/liblua.vcxproj.filters
@@ -4,9 +4,6 @@
{020bfeb5-842d-4139-94b3-8c4efa7c9d4c}
-
- {a7b0a396-a4d9-467c-808d-f127ea7ac30d}
-
{71825967-f1c3-4552-abf5-2b4618f567b7}
@@ -108,15 +105,6 @@
lua
-
- cocos2dx_support
-
-
- cocos2dx_support
-
-
- cocos2dx_support
-
tolua
@@ -203,15 +191,6 @@
lua
-
- cocos2dx_support
-
-
- cocos2dx_support
-
-
- cocos2dx_support
-
tolua