Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'iss1689-add-CCLuaObjcBridge' of https://github.com/minggo/cocos2d-x into iss1689-add-CCLuaObjcBridge

This commit is contained in:
minggo 2013-02-04 16:19:21 +08:00
parent 8511e75745 5163ef0d07
commit 8c1a639c59
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripting/lua/proj.win32/liblua.vcxproj
View File

@ -105,7 +105,10 @@
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\cocos2dx_support\CCLuaBridge.cpp" />
<ClCompile Include="..\cocos2dx_support\CCLuaEngine.cpp" /> <ClCompile Include="..\cocos2dx_support\CCLuaEngine.cpp" />
<ClCompile Include="..\cocos2dx_support\CCLuaStack.cpp" />
<ClCompile Include="..\cocos2dx_support\CCLuaValue.cpp" />
<ClCompile Include="..\cocos2dx_support\Cocos2dxLuaLoader.cpp" /> <ClCompile Include="..\cocos2dx_support\Cocos2dxLuaLoader.cpp" />
<ClCompile Include="..\cocos2dx_support\LuaCocos2d.cpp" /> <ClCompile Include="..\cocos2dx_support\LuaCocos2d.cpp" />
<ClCompile Include="..\cocos2dx_support\tolua_fix.c" /> <ClCompile Include="..\cocos2dx_support\tolua_fix.c" />
@ -147,7 +150,10 @@
<ClCompile Include="..\tolua\tolua_to.c" /> <ClCompile Include="..\tolua\tolua_to.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\cocos2dx_support\CCLuaBridge.h" />
<ClInclude Include="..\cocos2dx_support\CCLuaEngine.h" /> <ClInclude Include="..\cocos2dx_support\CCLuaEngine.h" />
<ClInclude Include="..\cocos2dx_support\CCLuaStack.h" />
<ClInclude Include="..\cocos2dx_support\CCLuaValue.h" />
<ClInclude Include="..\cocos2dx_support\Cocos2dxLuaLoader.h" /> <ClInclude Include="..\cocos2dx_support\Cocos2dxLuaLoader.h" />
<ClInclude Include="..\cocos2dx_support\LuaCocos2d.h" /> <ClInclude Include="..\cocos2dx_support\LuaCocos2d.h" />
<ClInclude Include="..\cocos2dx_support\tolua_fix.h" /> <ClInclude Include="..\cocos2dx_support\tolua_fix.h" />

18
scripting/lua/proj.win32/liblua.vcxproj.filters
View File

@ -132,6 +132,15 @@
<ClCompile Include="..\cocos2dx_support\tolua_fix.c"> <ClCompile Include="..\cocos2dx_support\tolua_fix.c">
<Filter>cocos2dx_support</Filter> <Filter>cocos2dx_support</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\cocos2dx_support\CCLuaBridge.cpp">
<Filter>cocos2dx_support</Filter>
</ClCompile>
<ClCompile Include="..\cocos2dx_support\CCLuaStack.cpp">
<Filter>cocos2dx_support</Filter>
</ClCompile>
<ClCompile Include="..\cocos2dx_support\CCLuaValue.cpp">
<Filter>cocos2dx_support</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\lua\lapi.h"> <ClInclude Include="..\lua\lapi.h">
@ -221,5 +230,14 @@
<ClInclude Include="..\cocos2dx_support\tolua_fix.h"> <ClInclude Include="..\cocos2dx_support\tolua_fix.h">
<Filter>cocos2dx_support</Filter> <Filter>cocos2dx_support</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\cocos2dx_support\CCLuaBridge.h">
<Filter>cocos2dx_support</Filter>
</ClInclude>
<ClInclude Include="..\cocos2dx_support\CCLuaStack.h">
<Filter>cocos2dx_support</Filter>
</ClInclude>
<ClInclude Include="..\cocos2dx_support\CCLuaValue.h">
<Filter>cocos2dx_support</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>