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

change cocos2d to libcocos2d for windows

This commit is contained in:
Huabing.Xu 2014-07-28 20:55:58 +08:00
parent 030d48ea32
commit 4a4f05c827
15 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build/cocos2d-win32.vc2012.sln
View File

@ -3,11 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosdenshion", "..\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
ProjectSection(ProjectDependencies) = postProject
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libextension", "..\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}"
@ -35,7 +30,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-empty-test", "..\tests\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-empty-test", "..\tests\lua-empty-test\project\proj.win32\lua-empty-test.vcxproj", "{13E55395-94A2-4CD9-BFC2-1A051F80C17D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBox2D", "..\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -47,10 +44,6 @@ Global
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.ActiveCfg = Debug|Win32
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32
@ -103,6 +96,10 @@ Global
{929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32
{929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32
{929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

0
cocos/2d/cocos2d.vcxproj → cocos/2d/libcocos2d.vcxproj
View File

0
cocos/2d/cocos2d.vcxproj.filters → cocos/2d/libcocos2d.vcxproj.filters
View File

2
cocos/audio/proj.win32/CocosDenshion.vcxproj
View File

@ -131,7 +131,7 @@
<ClCompile Include="..\win32\SimpleAudioEngine.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\2d\cocos2d.vcxproj">
<ProjectReference Include="..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
</ItemGroup>

2
cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj
View File

@ -149,7 +149,7 @@
<ProjectReference Include="..\..\..\..\extensions\proj.win32\libExtensions.vcxproj">
<Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\2d\cocos2d.vcxproj">
<ProjectReference Include="..\..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
</ItemGroup>

2
cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj
View File

@ -138,7 +138,7 @@
<ClInclude Include="..\WidgetReader\WidgetReaderProtocol.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\2d\cocos2d.vcxproj">
<ProjectReference Include="..\..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\audio\proj.win32\CocosDenshion.vcxproj">

5
cocos/editor-support/spine/proj.win32/libSpine.vcxproj
View File

@ -65,6 +65,11 @@
<ClCompile Include="..\SlotData.cpp" />
<ClCompile Include="..\spine-cocos2dx.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}</ProjectGuid>
<RootNamespace>libSpine</RootNamespace>

2
cocos/network/proj.win32/libNetwork.vcxproj
View File

@ -23,7 +23,7 @@
<ClCompile Include="..\WebSocket.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\2d\cocos2d.vcxproj">
<ProjectReference Include="..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
</ItemGroup>

5
cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj
View File

@ -134,6 +134,11 @@
<None Include="..\script\OpenglConstants.lua" />
<None Include="..\script\StudioConstants.lua" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{DDC3E27F-004D-4DD4-9DD3-931A013D2159}</ProjectGuid>
<RootNamespace>liblua</RootNamespace>

2
cocos/ui/proj.win32/libGUI.vcxproj
View File

@ -67,7 +67,7 @@
<ProjectReference Include="..\..\..\extensions\proj.win32\libExtensions.vcxproj">
<Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
</ProjectReference>
<ProjectReference Include="..\..\2d\cocos2d.vcxproj">
<ProjectReference Include="..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
</ItemGroup>

2
extensions/proj.win32/libExtensions.vcxproj
View File

@ -163,7 +163,7 @@
<ClInclude Include="Win32InputBox.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\cocos\2d\cocos2d.vcxproj">
<ProjectReference Include="..\..\cocos\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
</ItemGroup>

3
tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj
View File

@ -137,9 +137,8 @@
<ClInclude Include="main.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\cocos\2d\cocos2d.vcxproj">
<ProjectReference Include="..\..\..\cocos\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
<Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>

3
tests/cpp-tests/proj.win32/cpp-tests.vcxproj
View File

@ -558,9 +558,8 @@
<ClInclude Include="..\Classes\MutiTouchTest\MutiTouchTest.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\cocos\2d\cocos2d.vcxproj">
<ProjectReference Include="..\..\..\cocos\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
<Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>

2
tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj
View File

@ -175,7 +175,7 @@ xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\.
<ClInclude Include="main.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\cocos\2d\cocos2d.vcxproj">
<ProjectReference Include="..\..\..\..\cocos\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">

6
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
View File

@ -178,12 +178,12 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"</C
<ClCompile Include="main.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\cocos\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\..\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj">
<Project>{ddc3e27f-004d-4dd4-9dd3-931a013d2159}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\..\cocos\2d\cocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
<Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
</ProjectReference>