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

Updates win32 project configuration.

This commit is contained in:
James Chen 2014-03-10 11:23:35 +08:00
parent 11dc78a57b
commit 218dc822e1
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "..\tests\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "..\samples\cpp-tests\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}"
EndProject

34
samples/cpp-tests/proj.win32/TestCpp.vcxproj
View File

@ -36,13 +36,13 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\cocos\2d\cocos2dx.props" />
<Import Project="..\..\cocos\2d\cocos2d_headers.props" />
<Import Project="..\..\..\cocos\2d\cocos2dx.props" />
<Import Project="..\..\..\cocos\2d\cocos2d_headers.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\cocos\2d\cocos2dx.props" />
<Import Project="..\..\cocos\2d\cocos2d_headers.props" />
<Import Project="..\..\..\cocos\2d\cocos2dx.props" />
<Import Project="..\..\..\cocos\2d\cocos2d_headers.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@ -94,7 +94,7 @@
</PostBuildEvent>
<PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"
</Command>
</PreLinkEvent>
</ItemDefinitionGroup>
@ -130,7 +130,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDi
</PostBuildEvent>
<PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"
</Command>
</PreLinkEvent>
</ItemDefinitionGroup>
@ -541,41 +541,41 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDi
<ClInclude Include="..\Classes\MutiTouchTest\MutiTouchTest.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\cocos\2d\cocos2d.vcxproj">
<ProjectReference Include="..\..\..\cocos\2d\cocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
<ProjectReference Include="..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
<Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
<ProjectReference Include="..\..\..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
<Project>{811c0dab-7b96-4bd3-a154-b7572b58e4ab}</Project>
</ProjectReference>
<ProjectReference Include="..\..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
<ProjectReference Include="..\..\..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
<Project>{b57cf53f-2e49-4031-9822-047cc0e6bde2}</Project>
</ProjectReference>
<ProjectReference Include="..\..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj">
<ProjectReference Include="..\..\..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj">
<Project>{b7c2a162-dec9-4418-972e-240ab3cbfcae}</Project>
</ProjectReference>
<ProjectReference Include="..\..\cocos\gui\proj.win32\libGUI.vcxproj">
<ProjectReference Include="..\..\..\cocos\gui\proj.win32\libGUI.vcxproj">
<Project>{7e06e92c-537a-442b-9e4a-4761c84f8a1a}</Project>
</ProjectReference>
<ProjectReference Include="..\..\cocos\network\proj.win32\libNetwork.vcxproj">
<ProjectReference Include="..\..\..\cocos\network\proj.win32\libNetwork.vcxproj">
<Project>{df2638c0-8128-4847-867c-6eafe3dee7b5}</Project>
</ProjectReference>
<ProjectReference Include="..\..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
<ProjectReference Include="..\..\..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
<Project>{632a8f38-d0f0-4d22-86b3-d69f5e6bf63a}</Project>
</ProjectReference>
<ProjectReference Include="..\..\extensions\proj.win32\libExtensions.vcxproj">
<ProjectReference Include="..\..\..\extensions\proj.win32\libExtensions.vcxproj">
<Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\external\Box2D\proj.win32\Box2D.vcxproj">
<ProjectReference Include="..\..\..\external\Box2D\proj.win32\Box2D.vcxproj">
<Project>{929480e7-23c0-4df6-8456-096d71547116}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
<ProjectReference Include="..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
<Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

8
samples/cpp-tests/proj.win32/TestCpp.vcxproj.filters
View File

@ -648,7 +648,6 @@
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioComponentsTest\SceneController.cpp">
<Filter>Classes\ExtensionsTest\CocoStudioComponentsTest</Filter>
</ClCompile>
<ClCompile Include="..\Classes\ShaderTest\ShaderTest2.cpp" />
<ClCompile Include="..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.cpp">
<Filter>Classes\NewEventDispatcherTest</Filter>
</ClCompile>
@ -829,6 +828,9 @@
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\CustomTest\CustomParticleWidgetTest\CustomParticleWidgetTest.cpp">
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\CustomTest\CustomParticleWidgetTest</Filter>
</ClCompile>
<ClCompile Include="..\Classes\ShaderTest\ShaderTest2.cpp">
<Filter>Classes\ShaderTest</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="main.h">
@ -1329,7 +1331,6 @@
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioComponentsTest\SceneController.h">
<Filter>Classes\ExtensionsTest\CocoStudioComponentsTest</Filter>
</ClInclude>
<ClInclude Include="..\Classes\ShaderTest\ShaderTest2.h" />
<ClInclude Include="..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.h">
<Filter>Classes\NewEventDispatcherTest</Filter>
</ClInclude>
@ -1531,5 +1532,8 @@
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\CustomTest\CustomParticleWidgetTest\CustomParticleWidgetTest.h">
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\CustomTest\CustomParticleWidgetTest</Filter>
</ClInclude>
<ClInclude Include="..\Classes\ShaderTest\ShaderTest2.h">
<Filter>Classes\ShaderTest</Filter>
</ClInclude>
</ItemGroup>
</Project>