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

Updates VS project to fix compilation errors when building in Release mode.

This commit is contained in:
James Chen 2014-03-14 15:30:12 +08:00
parent d0fb0b9e6a
commit a94b82e738
2 changed files with 53 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
cocos/2d/cocos2d.vcxproj
View File

@ -84,6 +84,7 @@
<DebugInformationFormat>OldStyle</DebugInformationFormat> <DebugInformationFormat>OldStyle</DebugInformationFormat>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile> </ClCompile>
<PreLinkEvent> <PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)" <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
@ -129,6 +130,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile> </ClCompile>
<PreLinkEvent> <PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)" <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
@ -182,42 +184,20 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="..\base\CCValue.cpp" /> <ClCompile Include="..\base\CCValue.cpp" />
<ClCompile Include="..\base\etc1.cpp" /> <ClCompile Include="..\base\etc1.cpp" />
<ClCompile Include="..\base\s3tc.cpp" /> <ClCompile Include="..\base\s3tc.cpp" />
<ClCompile Include="..\math\kazmath\kazmath\aabb.c"> <ClCompile Include="..\math\kazmath\kazmath\aabb.c" />
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\GL\mat4stack.c" /> <ClCompile Include="..\math\kazmath\kazmath\GL\mat4stack.c" />
<ClCompile Include="..\math\kazmath\kazmath\GL\matrix.c" /> <ClCompile Include="..\math\kazmath\kazmath\GL\matrix.c" />
<ClCompile Include="..\math\kazmath\kazmath\mat3.c"> <ClCompile Include="..\math\kazmath\kazmath\mat3.c" />
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs> <ClCompile Include="..\math\kazmath\kazmath\mat4.c" />
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\mat4.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\neon_matrix_impl.c" /> <ClCompile Include="..\math\kazmath\kazmath\neon_matrix_impl.c" />
<ClCompile Include="..\math\kazmath\kazmath\plane.c"> <ClCompile Include="..\math\kazmath\kazmath\plane.c" />
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs> <ClCompile Include="..\math\kazmath\kazmath\quaternion.c" />
</ClCompile> <ClCompile Include="..\math\kazmath\kazmath\ray2.c" />
<ClCompile Include="..\math\kazmath\kazmath\quaternion.c"> <ClCompile Include="..\math\kazmath\kazmath\ray3.c" />
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs> <ClCompile Include="..\math\kazmath\kazmath\utility.c" />
</ClCompile> <ClCompile Include="..\math\kazmath\kazmath\vec2.c" />
<ClCompile Include="..\math\kazmath\kazmath\ray2.c"> <ClCompile Include="..\math\kazmath\kazmath\vec3.c" />
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs> <ClCompile Include="..\math\kazmath\kazmath\vec4.c" />
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\ray3.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\utility.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\vec2.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\vec3.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\vec4.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="..\physics\CCPhysicsBody.cpp" /> <ClCompile Include="..\physics\CCPhysicsBody.cpp" />
<ClCompile Include="..\physics\CCPhysicsContact.cpp" /> <ClCompile Include="..\physics\CCPhysicsContact.cpp" />
<ClCompile Include="..\physics\CCPhysicsJoint.cpp" /> <ClCompile Include="..\physics\CCPhysicsJoint.cpp" />
@ -558,6 +538,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="utlist.h" /> <ClInclude Include="utlist.h" />
<ClInclude Include="ZipUtils.h" /> <ClInclude Include="ZipUtils.h" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Text Include="..\math\kazmath\kazmath\CMakeLists.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

81
cocos/2d/cocos2d.vcxproj.filters
View File

@ -91,21 +91,6 @@
<Filter Include="physics\chipmunk"> <Filter Include="physics\chipmunk">
<UniqueIdentifier>{aeadfa95-9c89-4212-98ae-89ad57db596a}</UniqueIdentifier> <UniqueIdentifier>{aeadfa95-9c89-4212-98ae-89ad57db596a}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="kazmath\include">
<UniqueIdentifier>{05e27e68-7574-4a8b-af68-553dd3bafdfa}</UniqueIdentifier>
</Filter>
<Filter Include="kazmath\src">
<UniqueIdentifier>{b797075f-7437-46d5-b4ee-2aa2c108e98f}</UniqueIdentifier>
</Filter>
<Filter Include="kazmath\src\GL">
<UniqueIdentifier>{c755509d-1610-4e6c-b01b-e01d4d0de46e}</UniqueIdentifier>
</Filter>
<Filter Include="kazmath\include\kazmath">
<UniqueIdentifier>{e1b64497-c099-4f06-8d61-9d4c6b7a215a}</UniqueIdentifier>
</Filter>
<Filter Include="kazmath\include\kazmath\GL">
<UniqueIdentifier>{7c71abeb-8b4b-4be8-a23c-e32fedc65fc9}</UniqueIdentifier>
</Filter>
<Filter Include="base"> <Filter Include="base">
<UniqueIdentifier>{aec8225f-81a7-4213-b97b-7004d5535398}</UniqueIdentifier> <UniqueIdentifier>{aec8225f-81a7-4213-b97b-7004d5535398}</UniqueIdentifier>
</Filter> </Filter>
@ -115,6 +100,9 @@
<Filter Include="platform\desktop"> <Filter Include="platform\desktop">
<UniqueIdentifier>{32373f63-2c2d-4eab-bc4a-21745ba0b3fb}</UniqueIdentifier> <UniqueIdentifier>{32373f63-2c2d-4eab-bc4a-21745ba0b3fb}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="kazmath\GL">
<UniqueIdentifier>{465965df-dc31-471a-887f-e430125b8ba0}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\physics\CCPhysicsBody.cpp"> <ClCompile Include="..\physics\CCPhysicsBody.cpp">
@ -561,46 +549,46 @@
</ClCompile> </ClCompile>
<ClCompile Include="CCTweenFunction.cpp" /> <ClCompile Include="CCTweenFunction.cpp" />
<ClCompile Include="..\math\kazmath\kazmath\GL\mat4stack.c"> <ClCompile Include="..\math\kazmath\kazmath\GL\mat4stack.c">
<Filter>kazmath\src\GL</Filter> <Filter>kazmath\GL</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\GL\matrix.c"> <ClCompile Include="..\math\kazmath\kazmath\GL\matrix.c">
<Filter>kazmath\src\GL</Filter> <Filter>kazmath\GL</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\aabb.c"> <ClCompile Include="..\math\kazmath\kazmath\aabb.c">
<Filter>kazmath\src</Filter> <Filter>kazmath</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\mat3.c"> <ClCompile Include="..\math\kazmath\kazmath\mat3.c">
<Filter>kazmath\src</Filter> <Filter>kazmath</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\mat4.c"> <ClCompile Include="..\math\kazmath\kazmath\mat4.c">
<Filter>kazmath\src</Filter> <Filter>kazmath</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\neon_matrix_impl.c"> <ClCompile Include="..\math\kazmath\kazmath\neon_matrix_impl.c">
<Filter>kazmath\src</Filter> <Filter>kazmath</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\plane.c"> <ClCompile Include="..\math\kazmath\kazmath\plane.c">
<Filter>kazmath\src</Filter> <Filter>kazmath</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\quaternion.c"> <ClCompile Include="..\math\kazmath\kazmath\quaternion.c">
<Filter>kazmath\src</Filter> <Filter>kazmath</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\ray2.c"> <ClCompile Include="..\math\kazmath\kazmath\ray2.c">
<Filter>kazmath\src</Filter> <Filter>kazmath</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\ray3.c"> <ClCompile Include="..\math\kazmath\kazmath\ray3.c">
<Filter>kazmath\src</Filter> <Filter>kazmath</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\utility.c"> <ClCompile Include="..\math\kazmath\kazmath\utility.c">
<Filter>kazmath\src</Filter> <Filter>kazmath</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\vec2.c"> <ClCompile Include="..\math\kazmath\kazmath\vec2.c">
<Filter>kazmath\src</Filter> <Filter>kazmath</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\vec3.c"> <ClCompile Include="..\math\kazmath\kazmath\vec3.c">
<Filter>kazmath\src</Filter> <Filter>kazmath</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\vec4.c"> <ClCompile Include="..\math\kazmath\kazmath\vec4.c">
<Filter>kazmath\src</Filter> <Filter>kazmath</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -1162,49 +1150,54 @@
</ClInclude> </ClInclude>
<ClInclude Include="CCTweenFunction.h" /> <ClInclude Include="CCTweenFunction.h" />
<ClInclude Include="..\math\kazmath\kazmath\GL\mat4stack.h"> <ClInclude Include="..\math\kazmath\kazmath\GL\mat4stack.h">
<Filter>kazmath\include\kazmath\GL</Filter> <Filter>kazmath\GL</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\GL\matrix.h"> <ClInclude Include="..\math\kazmath\kazmath\GL\matrix.h">
<Filter>kazmath\include\kazmath\GL</Filter> <Filter>kazmath\GL</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\aabb.h"> <ClInclude Include="..\math\kazmath\kazmath\aabb.h">
<Filter>kazmath\include\kazmath</Filter> <Filter>kazmath</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\kazmath.h"> <ClInclude Include="..\math\kazmath\kazmath\kazmath.h">
<Filter>kazmath\include\kazmath</Filter> <Filter>kazmath</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\mat3.h"> <ClInclude Include="..\math\kazmath\kazmath\mat3.h">
<Filter>kazmath\include\kazmath</Filter> <Filter>kazmath</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\mat4.h"> <ClInclude Include="..\math\kazmath\kazmath\mat4.h">
<Filter>kazmath\include\kazmath</Filter> <Filter>kazmath</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\neon_matrix_impl.h"> <ClInclude Include="..\math\kazmath\kazmath\neon_matrix_impl.h">
<Filter>kazmath\include\kazmath</Filter> <Filter>kazmath</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\plane.h"> <ClInclude Include="..\math\kazmath\kazmath\plane.h">
<Filter>kazmath\include\kazmath</Filter> <Filter>kazmath</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\quaternion.h"> <ClInclude Include="..\math\kazmath\kazmath\quaternion.h">
<Filter>kazmath\include\kazmath</Filter> <Filter>kazmath</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\ray2.h"> <ClInclude Include="..\math\kazmath\kazmath\ray2.h">
<Filter>kazmath\include\kazmath</Filter> <Filter>kazmath</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\ray3.h"> <ClInclude Include="..\math\kazmath\kazmath\ray3.h">
<Filter>kazmath\include\kazmath</Filter> <Filter>kazmath</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\utility.h"> <ClInclude Include="..\math\kazmath\kazmath\utility.h">
<Filter>kazmath\include\kazmath</Filter> <Filter>kazmath</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\vec2.h"> <ClInclude Include="..\math\kazmath\kazmath\vec2.h">
<Filter>kazmath\include\kazmath</Filter> <Filter>kazmath</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\vec3.h"> <ClInclude Include="..\math\kazmath\kazmath\vec3.h">
<Filter>kazmath\include\kazmath</Filter> <Filter>kazmath</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\vec4.h"> <ClInclude Include="..\math\kazmath\kazmath\vec4.h">
<Filter>kazmath\include\kazmath</Filter> <Filter>kazmath</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Text Include="..\math\kazmath\kazmath\CMakeLists.txt">
<Filter>kazmath</Filter>
</Text>
</ItemGroup>
</Project> </Project>