From b053a9145a3963314b0e261c4e09b81b85471b30 Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Fri, 25 Apr 2014 22:03:25 -0700 Subject: [PATCH] Compiles on Windows32 --- cocos/2d/CCActionCamera.h | 2 +- cocos/2d/CCDirector.cpp | 2 +- cocos/2d/CCDirector.h | 2 +- cocos/2d/CCDrawingPrimitives.h | 2 +- cocos/2d/CCGLProgram.h | 2 +- cocos/2d/CCNode.h | 2 +- cocos/2d/ccTypes.h | 2 +- cocos/2d/cocos2d.vcxproj | 56 +++--- cocos/2d/cocos2d.vcxproj.filters | 171 +++++++----------- cocos/base/CCAffineTransform.h | 2 +- cocos/base/CCGeometry.h | 2 +- cocos/editor-support/cocostudio/CCArmature.h | 2 +- cocos/editor-support/cocostudio/CCBone.h | 2 +- .../spine/proj.win32/libSpine.vcxproj.filters | 3 + 14 files changed, 108 insertions(+), 144 deletions(-) diff --git a/cocos/2d/CCActionCamera.h b/cocos/2d/CCActionCamera.h index ae4fb3b4e2..a1b238694d 100644 --- a/cocos/2d/CCActionCamera.h +++ b/cocos/2d/CCActionCamera.h @@ -29,7 +29,7 @@ THE SOFTWARE. #define __CCCAMERA_ACTION_H__ #include "CCActionInterval.h" -#include "CCMath.h" +#include "math/CCMath.h" NS_CC_BEGIN diff --git a/cocos/2d/CCDirector.cpp b/cocos/2d/CCDirector.cpp index 3a0be565de..0b24d4abce 100644 --- a/cocos/2d/CCDirector.cpp +++ b/cocos/2d/CCDirector.cpp @@ -61,7 +61,7 @@ THE SOFTWARE. #include "renderer/CCRenderer.h" #include "CCConsole.h" -#include "CCMath.h" +#include "math/CCMath.h" /** Position of the FPS diff --git a/cocos/2d/CCDirector.h b/cocos/2d/CCDirector.h index 5d178f729f..6725324958 100644 --- a/cocos/2d/CCDirector.h +++ b/cocos/2d/CCDirector.h @@ -37,7 +37,7 @@ THE SOFTWARE. #include "CCGL.h" #include "CCLabelAtlas.h" #include -#include "CCMath.h" +#include "math/CCMath.h" NS_CC_BEGIN diff --git a/cocos/2d/CCDrawingPrimitives.h b/cocos/2d/CCDrawingPrimitives.h index fa6f2b8399..1018805c84 100644 --- a/cocos/2d/CCDrawingPrimitives.h +++ b/cocos/2d/CCDrawingPrimitives.h @@ -43,7 +43,7 @@ THE SOFTWARE. #include "ccTypes.h" #include "ccMacros.h" -#include "CCMath.h" +#include "math/CCMath.h" /** @file diff --git a/cocos/2d/CCGLProgram.h b/cocos/2d/CCGLProgram.h index f905f8f347..3e92e4a3b9 100644 --- a/cocos/2d/CCGLProgram.h +++ b/cocos/2d/CCGLProgram.h @@ -33,7 +33,7 @@ THE SOFTWARE. #include "ccMacros.h" #include "CCRef.h" #include "CCGL.h" -#include "CCMath.h" +#include "math/CCMath.h" #include NS_CC_BEGIN diff --git a/cocos/2d/CCNode.h b/cocos/2d/CCNode.h index 65dec46569..90f7601cd4 100644 --- a/cocos/2d/CCNode.h +++ b/cocos/2d/CCNode.h @@ -38,7 +38,7 @@ #include "CCProtocols.h" #include "CCEventDispatcher.h" #include "CCVector.h" -#include "CCMath.h" +#include "math/CCMath.h" NS_CC_BEGIN diff --git a/cocos/2d/ccTypes.h b/cocos/2d/ccTypes.h index c1dd6039af..7e30bae81b 100644 --- a/cocos/2d/ccTypes.h +++ b/cocos/2d/ccTypes.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include #include "CCGeometry.h" #include "CCGL.h" -#include "CCMath.h" +#include "math/CCMath.h" NS_CC_BEGIN diff --git a/cocos/2d/cocos2d.vcxproj b/cocos/2d/cocos2d.vcxproj index c85504a2bb..98409e4641 100644 --- a/cocos/2d/cocos2d.vcxproj +++ b/cocos/2d/cocos2d.vcxproj @@ -187,20 +187,12 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - - - - - - - - - - - - - - + + + + + + @@ -322,7 +314,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - @@ -365,21 +356,14 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - - - - - - - - - - - - - - - + + + + + + + + @@ -527,7 +511,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - @@ -542,7 +525,16 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - + + + + + + + + + + diff --git a/cocos/2d/cocos2d.vcxproj.filters b/cocos/2d/cocos2d.vcxproj.filters index 786611b56d..be200a0522 100644 --- a/cocos/2d/cocos2d.vcxproj.filters +++ b/cocos/2d/cocos2d.vcxproj.filters @@ -61,9 +61,6 @@ {5b082c5c-d396-43ca-b3b1-997d0f6247d0} - - {7751500e-ac9e-4604-a96d-670b30b7d8bd} - {163895ae-8a8e-46bf-bdf2-98bb2c1347fc} @@ -100,15 +97,15 @@ {32373f63-2c2d-4eab-bc4a-21745ba0b3fb} - - {465965df-dc31-471a-887f-e430125b8ba0} - {b4e2b1e5-2d79-44a3-af45-728d47b7bdb2} {0b1152b1-c732-4560-8629-87843b0fbd7c} + + {02a21a86-8f65-441b-ae13-11dec1c45ee5} + @@ -504,9 +501,6 @@ renderer - - renderer - renderer @@ -538,48 +532,6 @@ platform - - kazmath\GL - - - kazmath\GL - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - xxhash @@ -601,6 +553,24 @@ deprecated + + math + + + math + + + math + + + math + + + math + + + math + @@ -1099,9 +1069,6 @@ renderer - - renderer - renderer @@ -1133,51 +1100,6 @@ platform\desktop - - kazmath\GL - - - kazmath\GL - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - xxhash @@ -1211,10 +1133,57 @@ deprecated + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + - - kazmath + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + + + math \ No newline at end of file diff --git a/cocos/base/CCAffineTransform.h b/cocos/base/CCAffineTransform.h index 3bd5603574..622158e05f 100644 --- a/cocos/base/CCAffineTransform.h +++ b/cocos/base/CCAffineTransform.h @@ -28,7 +28,7 @@ THE SOFTWARE. #include "CCGeometry.h" #include "CCPlatformMacros.h" -#include "CCMath.h" +#include "math/CCMath.h" NS_CC_BEGIN diff --git a/cocos/base/CCGeometry.h b/cocos/base/CCGeometry.h index be4f06d836..e4e5b6ea5e 100644 --- a/cocos/base/CCGeometry.h +++ b/cocos/base/CCGeometry.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include "CCPlatformMacros.h" #include "ccMacros.h" -#include "CCMath.h" +#include "math/CCMath.h" NS_CC_BEGIN diff --git a/cocos/editor-support/cocostudio/CCArmature.h b/cocos/editor-support/cocostudio/CCArmature.h index cb3815e513..41c5124912 100644 --- a/cocos/editor-support/cocostudio/CCArmature.h +++ b/cocos/editor-support/cocostudio/CCArmature.h @@ -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; diff --git a/cocos/editor-support/cocostudio/CCBone.h b/cocos/editor-support/cocostudio/CCBone.h index 24de7068f5..8c45785ae9 100644 --- a/cocos/editor-support/cocostudio/CCBone.h +++ b/cocos/editor-support/cocostudio/CCBone.h @@ -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 { diff --git a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj.filters b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj.filters index fa0fecb5d7..a6f105d4bc 100644 --- a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj.filters +++ b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj.filters @@ -163,5 +163,8 @@ Source Files + + Source Files + \ No newline at end of file