From c7e9cee8353e3d865da5533578d92c9a3b50a575 Mon Sep 17 00:00:00 2001
From: Dhilan007 <wenhai.lin@chukong-inc.com>
Date: Sun, 26 Jan 2014 10:25:49 +0800
Subject: [PATCH] updated vs project[Lua]: 1.add files of socket 2.fixed miss
 include path 3.fixed miss lib for release

---
 cocos/scripting/lua/bindings/CCLuaStack.cpp   |  4 +-
 cocos/scripting/lua/bindings/liblua.vcxproj   | 33 ++++++-
 .../lua/bindings/liblua.vcxproj.filters       | 96 +++++++++++++++++++
 .../Lua/HelloLua/proj.win32/HelloLua.vcxproj  |  2 +-
 4 files changed, 131 insertions(+), 4 deletions(-)

diff --git a/cocos/scripting/lua/bindings/CCLuaStack.cpp b/cocos/scripting/lua/bindings/CCLuaStack.cpp
index fedbf3c7d1..e96d0d7d91 100644
--- a/cocos/scripting/lua/bindings/CCLuaStack.cpp
+++ b/cocos/scripting/lua/bindings/CCLuaStack.cpp
@@ -31,7 +31,7 @@ extern "C" {
 #include "lualib.h"
 #include "lauxlib.h"
 #include "tolua_fix.h"
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
 #include "lua_extensions.h"
 #endif
 }
@@ -149,7 +149,7 @@ bool LuaStack::init(void)
         {NULL, NULL}
     };
     luaL_register(_state, "_G", global_functions);
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
     luaopen_lua_extensions(_state);
 #endif
     g_luaType.clear();
diff --git a/cocos/scripting/lua/bindings/liblua.vcxproj b/cocos/scripting/lua/bindings/liblua.vcxproj
index c7fcc70043..f00dc2c19f 100644
--- a/cocos/scripting/lua/bindings/liblua.vcxproj
+++ b/cocos/scripting/lua/bindings/liblua.vcxproj
@@ -96,7 +96,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\..;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)extensions\network;$(EngineRoot)external;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\auto-generated\lua-bindings;$(EngineRoot)cocos\gui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\..;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)extensions\network;$(EngineRoot)external;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\auto-generated\lua-bindings;$(EngineRoot)cocos\gui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -152,8 +152,23 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$
     <ClCompile Include="lua_cocos2dx_manual.cpp" />
     <ClCompile Include="lua_cocos2dx_physics_manual.cpp" />
     <ClCompile Include="lua_cocos2dx_spine_manual.cpp" />
+    <ClCompile Include="lua_extensions.c" />
     <ClCompile Include="Lua_web_socket.cpp" />
     <ClCompile Include="lua_xml_http_request.cpp" />
+    <ClCompile Include="socket\auxiliar.c" />
+    <ClCompile Include="socket\except.c" />
+    <ClCompile Include="socket\inet.c" />
+    <ClCompile Include="socket\luasocket.c" />
+    <ClCompile Include="socket\luasocket_buffer.c" />
+    <ClCompile Include="socket\luasocket_io.c" />
+    <ClCompile Include="socket\mime.c" />
+    <ClCompile Include="socket\options.c" />
+    <ClCompile Include="socket\select.c" />
+    <ClCompile Include="socket\socket_scripts.c" />
+    <ClCompile Include="socket\tcp.c" />
+    <ClCompile Include="socket\timeout.c" />
+    <ClCompile Include="socket\udp.c" />
+    <ClCompile Include="socket\wsocket.c" />
     <ClCompile Include="tolua_fix.c" />
   </ItemGroup>
   <ItemGroup>
@@ -186,8 +201,24 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$
     <ClInclude Include="lua_cocos2dx_manual.hpp" />
     <ClInclude Include="lua_cocos2dx_physics_manual.hpp" />
     <ClInclude Include="lua_cocos2dx_spine_manual.hpp" />
+    <ClInclude Include="lua_extensions.h" />
     <ClInclude Include="Lua_web_socket.h" />
     <ClInclude Include="lua_xml_http_request.h" />
+    <ClInclude Include="socket\auxiliar.h" />
+    <ClInclude Include="socket\except.h" />
+    <ClInclude Include="socket\inet.h" />
+    <ClInclude Include="socket\luasocket.h" />
+    <ClInclude Include="socket\luasocket_buffer.h" />
+    <ClInclude Include="socket\luasocket_io.h" />
+    <ClInclude Include="socket\mime.h" />
+    <ClInclude Include="socket\options.h" />
+    <ClInclude Include="socket\select.h" />
+    <ClInclude Include="socket\socket.h" />
+    <ClInclude Include="socket\socket_scripts.h" />
+    <ClInclude Include="socket\tcp.h" />
+    <ClInclude Include="socket\timeout.h" />
+    <ClInclude Include="socket\udp.h" />
+    <ClInclude Include="socket\wsocket.h" />
     <ClInclude Include="tolua_fix.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/cocos/scripting/lua/bindings/liblua.vcxproj.filters b/cocos/scripting/lua/bindings/liblua.vcxproj.filters
index 57c0335ab0..e7190e46e4 100644
--- a/cocos/scripting/lua/bindings/liblua.vcxproj.filters
+++ b/cocos/scripting/lua/bindings/liblua.vcxproj.filters
@@ -16,6 +16,9 @@
     <Filter Include="cocos2dx_support\generated">
       <UniqueIdentifier>{19f563f0-e0ff-4500-890b-1755841d4ddb}</UniqueIdentifier>
     </Filter>
+    <Filter Include="cocos2dx_support\socket">
+      <UniqueIdentifier>{8815bb6e-fc9c-4cbf-b190-8b47169ed71f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\auto-generated\lua-bindings\lua_cocos2dx_auto.cpp">
@@ -111,6 +114,51 @@
     <ClCompile Include="..\..\auto-generated\lua-bindings\lua_cocos2dx_physics_auto.cpp">
       <Filter>cocos2dx_support\generated</Filter>
     </ClCompile>
+    <ClCompile Include="socket\auxiliar.c">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClCompile>
+    <ClCompile Include="socket\except.c">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClCompile>
+    <ClCompile Include="socket\inet.c">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClCompile>
+    <ClCompile Include="socket\luasocket.c">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClCompile>
+    <ClCompile Include="socket\luasocket_buffer.c">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClCompile>
+    <ClCompile Include="socket\luasocket_io.c">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClCompile>
+    <ClCompile Include="socket\mime.c">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClCompile>
+    <ClCompile Include="socket\options.c">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClCompile>
+    <ClCompile Include="socket\select.c">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClCompile>
+    <ClCompile Include="socket\socket_scripts.c">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClCompile>
+    <ClCompile Include="socket\tcp.c">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClCompile>
+    <ClCompile Include="socket\timeout.c">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClCompile>
+    <ClCompile Include="socket\udp.c">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClCompile>
+    <ClCompile Include="socket\wsocket.c">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClCompile>
+    <ClCompile Include="lua_extensions.c">
+      <Filter>cocos2dx_support</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\auto-generated\lua-bindings\lua_cocos2dx_auto.hpp">
@@ -209,6 +257,54 @@
     <ClInclude Include="..\..\auto-generated\lua-bindings\lua_cocos2dx_physics_auto.hpp">
       <Filter>cocos2dx_support\generated</Filter>
     </ClInclude>
+    <ClInclude Include="socket\auxiliar.h">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClInclude>
+    <ClInclude Include="socket\except.h">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClInclude>
+    <ClInclude Include="socket\inet.h">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClInclude>
+    <ClInclude Include="socket\luasocket.h">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClInclude>
+    <ClInclude Include="socket\luasocket_buffer.h">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClInclude>
+    <ClInclude Include="socket\luasocket_io.h">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClInclude>
+    <ClInclude Include="socket\mime.h">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClInclude>
+    <ClInclude Include="socket\options.h">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClInclude>
+    <ClInclude Include="socket\select.h">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClInclude>
+    <ClInclude Include="socket\socket.h">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClInclude>
+    <ClInclude Include="socket\socket_scripts.h">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClInclude>
+    <ClInclude Include="socket\tcp.h">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClInclude>
+    <ClInclude Include="socket\timeout.h">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClInclude>
+    <ClInclude Include="socket\udp.h">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClInclude>
+    <ClInclude Include="socket\wsocket.h">
+      <Filter>cocos2dx_support\socket</Filter>
+    </ClInclude>
+    <ClInclude Include="lua_extensions.h">
+      <Filter>cocos2dx_support</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\auto-generated\lua-bindings\lua_cocos2dx_auto_api.js">
diff --git a/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj b/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
index dc57ee0d68..0cc2b4270a 100644
--- a/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
+++ b/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
@@ -140,7 +140,7 @@
       <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>lua51.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libcurl_imp.lib;lua51.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>