Merge pull request #2965 from dumganhar/develop

[Win32] Adding COCOS2D_DEBUG=1 for liblua project. Adding missing files in liblu...
This commit is contained in:
James Chen 2013-06-20 21:08:36 -07:00
commit c14c1f1d27
2 changed files with 9 additions and 1 deletions

View File

@ -64,7 +64,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\cocos2dx;$(ProjectDir)..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\pthread;$(ProjectDir)..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\extensions;$(ProjectDir)..\..\..\extensions\network;$(ProjectDir)..\..\..\external\libwebsockets\win32\include;$(ProjectDir)..\tolua;$(ProjectDir)..\luajit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -128,6 +128,7 @@ xcopy /Y /Q "$(ProjectDir)..\luajit\win32\*.*" "$(OutDir)"</Command>
<ClCompile Include="..\cocos2dx_support\CCLuaValue.cpp" />
<ClCompile Include="..\cocos2dx_support\Cocos2dxLuaLoader.cpp" />
<ClCompile Include="..\cocos2dx_support\LuaCocos2d.cpp" />
<ClCompile Include="..\cocos2dx_support\LuaOpengl.cpp" />
<ClCompile Include="..\cocos2dx_support\Lua_extensions_CCB.cpp" />
<ClCompile Include="..\cocos2dx_support\Lua_web_socket.cpp" />
<ClCompile Include="..\cocos2dx_support\tolua_fix.c" />
@ -145,6 +146,7 @@ xcopy /Y /Q "$(ProjectDir)..\luajit\win32\*.*" "$(OutDir)"</Command>
<ClInclude Include="..\cocos2dx_support\CCLuaValue.h" />
<ClInclude Include="..\cocos2dx_support\Cocos2dxLuaLoader.h" />
<ClInclude Include="..\cocos2dx_support\LuaCocos2d.h" />
<ClInclude Include="..\cocos2dx_support\LuaOpengl.h" />
<ClInclude Include="..\cocos2dx_support\Lua_extensions_CCB.h" />
<ClInclude Include="..\cocos2dx_support\Lua_web_socket.h" />
<ClInclude Include="..\cocos2dx_support\tolua_fix.h" />

View File

@ -60,6 +60,9 @@
<ClCompile Include="..\cocos2dx_support\Lua_web_socket.cpp">
<Filter>cocos2dx_support</Filter>
</ClCompile>
<ClCompile Include="..\cocos2dx_support\LuaOpengl.cpp">
<Filter>cocos2dx_support</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\tolua\tolua++.h">
@ -110,5 +113,8 @@
<ClInclude Include="..\cocos2dx_support\Lua_web_socket.h">
<Filter>cocos2dx_support</Filter>
</ClInclude>
<ClInclude Include="..\cocos2dx_support\LuaOpengl.h">
<Filter>cocos2dx_support</Filter>
</ClInclude>
</ItemGroup>
</Project>