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

Compiles on Windows32

This commit is contained in:
Ricardo Quesada 2014-04-25 22:03:25 -07:00
parent 0860455724
commit b053a9145a
14 changed files with 108 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCActionCamera.h
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#define __CCCAMERA_ACTION_H__
#include "CCActionInterval.h"
#include "CCMath.h"
#include "math/CCMath.h"
NS_CC_BEGIN

2
cocos/2d/CCDirector.cpp
View File

@ -61,7 +61,7 @@ THE SOFTWARE.
#include "renderer/CCRenderer.h"
#include "CCConsole.h"
#include "CCMath.h"
#include "math/CCMath.h"
/**
Position of the FPS

2
cocos/2d/CCDirector.h
View File

@ -37,7 +37,7 @@ THE SOFTWARE.
#include "CCGL.h"
#include "CCLabelAtlas.h"
#include <stack>
#include "CCMath.h"
#include "math/CCMath.h"
NS_CC_BEGIN

2
cocos/2d/CCDrawingPrimitives.h
View File

@ -43,7 +43,7 @@ THE SOFTWARE.
#include "ccTypes.h"
#include "ccMacros.h"
#include "CCMath.h"
#include "math/CCMath.h"
/**
@file

2
cocos/2d/CCGLProgram.h
View File

@ -33,7 +33,7 @@ THE SOFTWARE.
#include "ccMacros.h"
#include "CCRef.h"
#include "CCGL.h"
#include "CCMath.h"
#include "math/CCMath.h"
#include <set>
NS_CC_BEGIN

2
cocos/2d/CCNode.h
View File

@ -38,7 +38,7 @@
#include "CCProtocols.h"
#include "CCEventDispatcher.h"
#include "CCVector.h"
#include "CCMath.h"
#include "math/CCMath.h"
NS_CC_BEGIN

2
cocos/2d/ccTypes.h
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include <string>
#include "CCGeometry.h"
#include "CCGL.h"
#include "CCMath.h"
#include "math/CCMath.h"
NS_CC_BEGIN

56
cocos/2d/cocos2d.vcxproj
View File

@ -187,20 +187,12 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="..\deprecated\CCNotificationCenter.cpp" />
<ClCompile Include="..\deprecated\CCSet.cpp" />
<ClCompile Include="..\deprecated\CCString.cpp" />
<ClCompile Include="..\math\kazmath\kazmath\aabb.c" />
<ClCompile Include="..\math\kazmath\kazmath\GL\mat4stack.c" />
<ClCompile Include="..\math\kazmath\kazmath\GL\matrix.c" />
<ClCompile Include="..\math\kazmath\kazmath\mat3.c" />
<ClCompile Include="..\math\kazmath\kazmath\mat4.c" />
<ClCompile Include="..\math\kazmath\kazmath\neon_matrix_impl.c" />
<ClCompile Include="..\math\kazmath\kazmath\plane.c" />
<ClCompile Include="..\math\kazmath\kazmath\quaternion.c" />
<ClCompile Include="..\math\kazmath\kazmath\ray2.c" />
<ClCompile Include="..\math\kazmath\kazmath\ray3.c" />
<ClCompile Include="..\math\kazmath\kazmath\utility.c" />
<ClCompile Include="..\math\kazmath\kazmath\vec2.c" />
<ClCompile Include="..\math\kazmath\kazmath\vec3.c" />
<ClCompile Include="..\math\kazmath\kazmath\vec4.c" />
<ClCompile Include="..\math\MathUtil.cpp" />
<ClCompile Include="..\math\Matrix.cpp" />
<ClCompile Include="..\math\Quaternion.cpp" />
<ClCompile Include="..\math\Vector2.cpp" />
<ClCompile Include="..\math\Vector3.cpp" />
<ClCompile Include="..\math\Vector4.cpp" />
<ClCompile Include="..\physics\CCPhysicsBody.cpp" />
<ClCompile Include="..\physics\CCPhysicsContact.cpp" />
<ClCompile Include="..\physics\CCPhysicsJoint.cpp" />
@ -322,7 +314,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="platform\win32\CCStdC.cpp" />
<ClCompile Include="renderer\CCBatchCommand.cpp" />
<ClCompile Include="renderer\CCCustomCommand.cpp" />
<ClCompile Include="renderer\CCFrustum.cpp" />
<ClCompile Include="renderer\CCGroupCommand.cpp" />
<ClCompile Include="renderer\CCMaterialManager.cpp" />
<ClCompile Include="renderer\CCQuadCommand.cpp" />
@ -365,21 +356,14 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="..\deprecated\CCNotificationCenter.h" />
<ClInclude Include="..\deprecated\CCSet.h" />
<ClInclude Include="..\deprecated\CCString.h" />
<ClInclude Include="..\math\kazmath\kazmath\aabb.h" />
<ClInclude Include="..\math\kazmath\kazmath\GL\mat4stack.h" />
<ClInclude Include="..\math\kazmath\kazmath\GL\matrix.h" />
<ClInclude Include="..\math\kazmath\kazmath\kazmath.h" />
<ClInclude Include="..\math\kazmath\kazmath\mat3.h" />
<ClInclude Include="..\math\kazmath\kazmath\mat4.h" />
<ClInclude Include="..\math\kazmath\kazmath\neon_matrix_impl.h" />
<ClInclude Include="..\math\kazmath\kazmath\plane.h" />
<ClInclude Include="..\math\kazmath\kazmath\quaternion.h" />
<ClInclude Include="..\math\kazmath\kazmath\ray2.h" />
<ClInclude Include="..\math\kazmath\kazmath\ray3.h" />
<ClInclude Include="..\math\kazmath\kazmath\utility.h" />
<ClInclude Include="..\math\kazmath\kazmath\vec2.h" />
<ClInclude Include="..\math\kazmath\kazmath\vec3.h" />
<ClInclude Include="..\math\kazmath\kazmath\vec4.h" />
<ClInclude Include="..\math\CCMath.h" />
<ClInclude Include="..\math\CCMathBase.h" />
<ClInclude Include="..\math\MathUtil.h" />
<ClInclude Include="..\math\Matrix.h" />
<ClInclude Include="..\math\Quaternion.h" />
<ClInclude Include="..\math\Vector2.h" />
<ClInclude Include="..\math\Vector3.h" />
<ClInclude Include="..\math\Vector4.h" />
<ClInclude Include="..\physics\CCPhysicsBody.h" />
<ClInclude Include="..\physics\CCPhysicsContact.h" />
<ClInclude Include="..\physics\CCPhysicsJoint.h" />
@ -527,7 +511,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="platform\win32\CCStdC.h" />
<ClInclude Include="renderer\CCBatchCommand.h" />
<ClInclude Include="renderer\CCCustomCommand.h" />
<ClInclude Include="renderer\CCFrustum.h" />
<ClInclude Include="renderer\CCGroupCommand.h" />
<ClInclude Include="renderer\CCMaterialManager.h" />
<ClInclude Include="renderer\CCQuadCommand.h" />
@ -542,7 +525,16 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="ZipUtils.h" />
</ItemGroup>
<ItemGroup>
<Text Include="..\math\kazmath\kazmath\CMakeLists.txt" />
<None Include="..\math\MathUtil.inl" />
<None Include="..\math\MathUtilNeon.inl" />
<None Include="..\math\Matrix.inl" />
<None Include="..\math\Quaternion.inl" />
<None Include="..\math\Vector2.inl" />
<None Include="..\math\Vector3.inl" />
<None Include="..\math\Vector4.inl" />
</ItemGroup>
<ItemGroup>
<Text Include="..\math\CMakeLists.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

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

@ -61,9 +61,6 @@
<Filter Include="script_support">
<UniqueIdentifier>{5b082c5c-d396-43ca-b3b1-997d0f6247d0}</UniqueIdentifier>
</Filter>
<Filter Include="kazmath">
<UniqueIdentifier>{7751500e-ac9e-4604-a96d-670b30b7d8bd}</UniqueIdentifier>
</Filter>
<Filter Include="shaders">
<UniqueIdentifier>{163895ae-8a8e-46bf-bdf2-98bb2c1347fc}</UniqueIdentifier>
</Filter>
@ -100,15 +97,15 @@
<Filter Include="platform\desktop">
<UniqueIdentifier>{32373f63-2c2d-4eab-bc4a-21745ba0b3fb}</UniqueIdentifier>
</Filter>
<Filter Include="kazmath\GL">
<UniqueIdentifier>{465965df-dc31-471a-887f-e430125b8ba0}</UniqueIdentifier>
</Filter>
<Filter Include="xxhash">
<UniqueIdentifier>{b4e2b1e5-2d79-44a3-af45-728d47b7bdb2}</UniqueIdentifier>
</Filter>
<Filter Include="deprecated">
<UniqueIdentifier>{0b1152b1-c732-4560-8629-87843b0fbd7c}</UniqueIdentifier>
</Filter>
<Filter Include="math">
<UniqueIdentifier>{02a21a86-8f65-441b-ae13-11dec1c45ee5}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\physics\CCPhysicsBody.cpp">
@ -504,9 +501,6 @@
<ClCompile Include="renderer\CCCustomCommand.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\CCFrustum.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\CCGroupCommand.cpp">
<Filter>renderer</Filter>
</ClCompile>
@ -538,48 +532,6 @@
<Filter>platform</Filter>
</ClCompile>
<ClCompile Include="CCTweenFunction.cpp" />
<ClCompile Include="..\math\kazmath\kazmath\GL\mat4stack.c">
<Filter>kazmath\GL</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\GL\matrix.c">
<Filter>kazmath\GL</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\aabb.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\mat3.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\mat4.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\neon_matrix_impl.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\plane.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\quaternion.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\ray2.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\ray3.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\utility.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\vec2.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\vec3.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\vec4.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\..\external\xxhash\xxhash.c">
<Filter>xxhash</Filter>
</ClCompile>
@ -601,6 +553,24 @@
<ClCompile Include="..\deprecated\CCString.cpp">
<Filter>deprecated</Filter>
</ClCompile>
<ClCompile Include="..\math\Matrix.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\math\Quaternion.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\math\Vector2.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\math\Vector3.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\math\Vector4.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\math\MathUtil.cpp">
<Filter>math</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\physics\CCPhysicsBody.h">
@ -1099,9 +1069,6 @@
<ClInclude Include="renderer\CCCustomCommand.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\CCFrustum.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\CCGroupCommand.h">
<Filter>renderer</Filter>
</ClInclude>
@ -1133,51 +1100,6 @@
<Filter>platform\desktop</Filter>
</ClInclude>
<ClInclude Include="CCTweenFunction.h" />
<ClInclude Include="..\math\kazmath\kazmath\GL\mat4stack.h">
<Filter>kazmath\GL</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\GL\matrix.h">
<Filter>kazmath\GL</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\aabb.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\kazmath.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\mat3.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\mat4.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\neon_matrix_impl.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\plane.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\quaternion.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\ray2.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\ray3.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\utility.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\vec2.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\vec3.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\vec4.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\..\external\xxhash\xxhash.h">
<Filter>xxhash</Filter>
</ClInclude>
@ -1211,10 +1133,57 @@
<ClInclude Include="..\deprecated\CCString.h">
<Filter>deprecated</Filter>
</ClInclude>
<ClInclude Include="..\math\MathUtil.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\Matrix.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\Quaternion.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\Vector2.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\Vector3.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\Vector4.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\CCMath.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\CCMathBase.h">
<Filter>math</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="..\math\kazmath\kazmath\CMakeLists.txt">
<Filter>kazmath</Filter>
<None Include="..\math\MathUtil.inl">
<Filter>math</Filter>
</None>
<None Include="..\math\MathUtilNeon.inl">
<Filter>math</Filter>
</None>
<None Include="..\math\Matrix.inl">
<Filter>math</Filter>
</None>
<None Include="..\math\Quaternion.inl">
<Filter>math</Filter>
</None>
<None Include="..\math\Vector2.inl">
<Filter>math</Filter>
</None>
<None Include="..\math\Vector3.inl">
<Filter>math</Filter>
</None>
<None Include="..\math\Vector4.inl">
<Filter>math</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Text Include="..\math\CMakeLists.txt">
<Filter>math</Filter>
</Text>
</ItemGroup>
</Project>

2
cocos/base/CCAffineTransform.h
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
#include "CCGeometry.h"
#include "CCPlatformMacros.h"
#include "CCMath.h"
#include "math/CCMath.h"
NS_CC_BEGIN

2
cocos/base/CCGeometry.h
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "CCPlatformMacros.h"
#include "ccMacros.h"
#include "CCMath.h"
#include "math/CCMath.h"
NS_CC_BEGIN

2
cocos/editor-support/cocostudio/CCArmature.h
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "cocostudio/CCArmatureAnimation.h"
#include "cocostudio/CCSpriteFrameCacheHelper.h"
#include "cocostudio/CCArmatureDataManager.h"
#include "CCMath.h"
#include "math/CCMath.h"
class b2Body;
struct cpBody;

2
cocos/editor-support/cocostudio/CCBone.h
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "cocostudio/CCDecorativeDisplay.h"
#include "cocostudio/CCDisplayManager.h"
#include "CCNode.h"
#include "CCMath.h"
#include "math/CCMath.h"
namespace cocostudio {

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

@ -163,5 +163,8 @@
<ClCompile Include="..\RegionAttachment.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\BoneData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>