diff --git a/Box2D/proj.win32/Box2D.win32.vcxproj b/Box2D/proj.win32/Box2D.win32.vcxproj
new file mode 100644
index 000000000000..269b06804764
--- /dev/null
+++ b/Box2D/proj.win32/Box2D.win32.vcxproj
@@ -0,0 +1,161 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ libBox2D
+ {929480E7-23C0-4DF6-8456-096D71547116}
+ Box2D.win32
+ Win32Proj
+
+
+
+ StaticLibrary
+ Unicode
+
+
+ StaticLibrary
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(SolutionDir)$(Configuration).win32\
+ $(Configuration).win32\
+ $(SolutionDir)$(Configuration).win32\
+ $(Configuration).win32\
+ AllRules.ruleset
+
+
+ AllRules.ruleset
+
+
+
+
+
+ Disabled
+ ../../;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+
+
+ $(OutDir)$(ProjectName).lib
+
+
+
+
+ ../../;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+
+
+ $(OutDir)$(ProjectName).lib
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Box2D/proj.win32/Box2D.win32.vcxproj.filters b/Box2D/proj.win32/Box2D.win32.vcxproj.filters
new file mode 100644
index 000000000000..aa2e31d86620
--- /dev/null
+++ b/Box2D/proj.win32/Box2D.win32.vcxproj.filters
@@ -0,0 +1,237 @@
+
+
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/Box2D/proj.win32/Box2D.win32.vcxproj.user b/Box2D/proj.win32/Box2D.win32.vcxproj.user
new file mode 100644
index 000000000000..3f030911244a
--- /dev/null
+++ b/Box2D/proj.win32/Box2D.win32.vcxproj.user
@@ -0,0 +1,6 @@
+
+
+
+ false
+
+
\ No newline at end of file
diff --git a/CocosDenshion/proj.win32/CocosDenshion.win32.vcxproj b/CocosDenshion/proj.win32/CocosDenshion.win32.vcxproj
new file mode 100644
index 000000000000..e543534be291
--- /dev/null
+++ b/CocosDenshion/proj.win32/CocosDenshion.win32.vcxproj
@@ -0,0 +1,108 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ libCocosDenshion
+ {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
+ CocosDenshion.win32
+ Win32Proj
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(SolutionDir)$(Configuration).win32\
+ $(Configuration).win32\
+ true
+ $(SolutionDir)$(Configuration).win32\
+ $(Configuration).win32\
+ true
+ AllRules.ruleset
+
+
+ AllRules.ruleset
+
+
+
+
+
+ Disabled
+ ..\Include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;COCOSDENSHIONWIN32_EXPORTS;_EXPORT_DLL_;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+
+
+ winmm.lib;%(AdditionalDependencies)
+ $(OutDir)$(ProjectName).dll
+ true
+ Windows
+ $(TargetDir)$(TargetName).lib
+ MachineX86
+
+
+
+
+ ..\Include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;COCOSDENSHIONWIN32_EXPORTS;_EXPORT_DLL_;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+
+
+ winmm.lib;%(AdditionalDependencies)
+ $(OutDir)$(ProjectName).dll
+ true
+ Windows
+ true
+ true
+ $(TargetDir)$(TargetName).lib
+ MachineX86
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CocosDenshion/proj.win32/CocosDenshion.win32.vcxproj.filters b/CocosDenshion/proj.win32/CocosDenshion.win32.vcxproj.filters
new file mode 100644
index 000000000000..b63914e5008e
--- /dev/null
+++ b/CocosDenshion/proj.win32/CocosDenshion.win32.vcxproj.filters
@@ -0,0 +1,36 @@
+
+
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/CocosDenshion/proj.win32/CocosDenshion.win32.vcxproj.user b/CocosDenshion/proj.win32/CocosDenshion.win32.vcxproj.user
new file mode 100644
index 000000000000..3f030911244a
--- /dev/null
+++ b/CocosDenshion/proj.win32/CocosDenshion.win32.vcxproj.user
@@ -0,0 +1,6 @@
+
+
+
+ false
+
+
\ No newline at end of file
diff --git a/HelloWorld/win32/HelloWorld.win32.vcxproj b/HelloWorld/win32/HelloWorld.win32.vcxproj
new file mode 100644
index 000000000000..f4e869674e24
--- /dev/null
+++ b/HelloWorld/win32/HelloWorld.win32.vcxproj
@@ -0,0 +1,125 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ HelloWorld
+ {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}
+ HelloWorldwin32
+ Win32Proj
+
+
+
+ Application
+ Unicode
+ true
+
+
+ Application
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(SolutionDir)$(Configuration).win32\
+ $(Configuration).win32\
+ true
+ $(SolutionDir)$(Configuration).win32\
+ $(Configuration).win32\
+ false
+ AllRules.ruleset
+
+
+ AllRules.ruleset
+
+
+
+
+
+ Disabled
+ $(SolutionDir)cocos2dx\platform;$(SolutionDir)cocos2dx\include;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;..\;.\;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+
+
+ libcocos2d.lib;%(AdditionalDependencies)
+ $(OutDir)$(ProjectName).exe
+ $(OutDir);%(AdditionalLibraryDirectories)
+ true
+ Windows
+ MachineX86
+
+
+ copy /Y "$(ProjectDir)..\Resource\*.*" "$(OutDir)"
+
+
+
+
+ MaxSpeed
+ true
+ $(SolutionDir)cocos2dx\platform;$(SolutionDir)cocos2dx\include;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;..\;.\;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ ProgramDatabase
+
+
+ libcocos2d.lib;%(AdditionalDependencies)
+ $(OutDir)$(ProjectName).exe
+ $(OutDir);%(AdditionalLibraryDirectories)
+ true
+ Windows
+ true
+ true
+ MachineX86
+
+
+ copy /Y "$(ProjectDir)..\Resource\*.*" "$(OutDir)"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}
+ false
+
+
+
+
+
+
\ No newline at end of file
diff --git a/HelloWorld/win32/HelloWorld.win32.vcxproj.filters b/HelloWorld/win32/HelloWorld.win32.vcxproj.filters
new file mode 100644
index 000000000000..6ee522680ef8
--- /dev/null
+++ b/HelloWorld/win32/HelloWorld.win32.vcxproj.filters
@@ -0,0 +1,35 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+
+
+ Classes
+
+
+ Classes
+
+
+ win32
+
+
+
+
+ Classes
+
+
+ Classes
+
+
+ win32
+
+
+
\ No newline at end of file
diff --git a/HelloWorld/win32/HelloWorld.win32.vcxproj.user b/HelloWorld/win32/HelloWorld.win32.vcxproj.user
new file mode 100644
index 000000000000..3f030911244a
--- /dev/null
+++ b/HelloWorld/win32/HelloWorld.win32.vcxproj.user
@@ -0,0 +1,6 @@
+
+
+
+ false
+
+
\ No newline at end of file
diff --git a/build-win32.bat b/build-win32.bat
index 09e154f30752..44ca5781557e 100644
--- a/build-win32.bat
+++ b/build-win32.bat
@@ -7,10 +7,10 @@ echo.
if defined VS90COMNTOOLS (
set VSVARS="%VS90COMNTOOLS%vsvars32.bat"
-) else (
- if defined VS100COMNTOOLS (
- set VSVARS="%VS100COMNTOOLS%vsvars32.bat"
- )
+ set VC_VER=90
+) else if defined VS100COMNTOOLS (
+ set VSVARS="%VS100COMNTOOLS%vsvars32.bat"
+ set VC_VER=100
)
if not defined VSVARS (
@@ -24,7 +24,14 @@ echo.*/
echo.
call %VSVARS%
-vcbuild cocos2d-win32.sln $ALL
+if %VC_VER%==90 (
+ vcbuild cocos2d-win32.vc2008.sln $ALL
+) else if %VC_VER%==100 (
+ msbuild cocos2d-win32.vc2010.sln /p:Configuration="Debug" /p:Configuration="Release"
+) else (
+ echo Script error.
+ goto ERROR
+)
echo./*
echo.* Check the cocos2d-win32 application "tests.exe" ...
diff --git a/chipmunk/proj.win32/chipmunk.win32.vcxproj b/chipmunk/proj.win32/chipmunk.win32.vcxproj
new file mode 100644
index 000000000000..258a2ae62e07
--- /dev/null
+++ b/chipmunk/proj.win32/chipmunk.win32.vcxproj
@@ -0,0 +1,148 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ libchipmunk
+ {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}
+ Win32Proj
+
+
+
+ StaticLibrary
+ Unicode
+
+
+ StaticLibrary
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(SolutionDir)$(Configuration).win32\
+ $(Configuration).win32\
+ $(SolutionDir)$(Configuration).win32\
+ $(Configuration).win32\
+ AllRules.ruleset
+
+
+ AllRules.ruleset
+
+
+
+
+
+ Disabled
+ ..\include\chipmunk;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ false
+
+
+ Level3
+ EditAndContinue
+ CompileAsCpp
+ 4068;4996;%(DisableSpecificWarnings)
+
+
+ $(OutDir)$(ProjectName).lib
+
+
+
+
+ ..\include\chipmunk;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ false
+
+
+ Level3
+ ProgramDatabase
+ CompileAsCpp
+ 4068;4996;%(DisableSpecificWarnings)
+
+
+ $(OutDir)$(ProjectName).lib
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/chipmunk/proj.win32/chipmunk.win32.vcxproj.filters b/chipmunk/proj.win32/chipmunk.win32.vcxproj.filters
new file mode 100644
index 000000000000..327240756350
--- /dev/null
+++ b/chipmunk/proj.win32/chipmunk.win32.vcxproj.filters
@@ -0,0 +1,173 @@
+
+
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+
+
+
+
\ No newline at end of file
diff --git a/chipmunk/proj.win32/chipmunk.win32.vcxproj.user b/chipmunk/proj.win32/chipmunk.win32.vcxproj.user
new file mode 100644
index 000000000000..3f030911244a
--- /dev/null
+++ b/chipmunk/proj.win32/chipmunk.win32.vcxproj.user
@@ -0,0 +1,6 @@
+
+
+
+ false
+
+
\ No newline at end of file
diff --git a/cocos2d-win32.sln b/cocos2d-win32.vc2008.sln
similarity index 98%
rename from cocos2d-win32.sln
rename to cocos2d-win32.vc2008.sln
index 7328552f1bdf..072298716108 100644
--- a/cocos2d-win32.sln
+++ b/cocos2d-win32.vc2008.sln
@@ -1,59 +1,59 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBox2D", "Box2D\proj.win32\Box2D.win32.vcproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "chipmunk\proj.win32\chipmunk.win32.vcproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosDenshion", "CocosDenshion\proj.win32\CocosDenshion.win32.vcproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "cocos2dx\proj.win32\cocos2d-win32.vcproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld\win32\HelloWorld.win32.vcproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}"
- ProjectSection(ProjectDependencies) = postProject
- {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\test.win32\test.win32.vcproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
- ProjectSection(ProjectDependencies) = postProject
- {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
- {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}
- {929480E7-23C0-4DF6-8456-096D71547116} = {929480E7-23C0-4DF6-8456-096D71547116}
- {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32
- {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
- {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
- {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32
- {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32
- {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
- {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.ActiveCfg = Debug|Win32
- {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.Build.0 = Debug|Win32
- {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.ActiveCfg = Release|Win32
- {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.Build.0 = Release|Win32
- {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.ActiveCfg = Debug|Win32
- {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.Build.0 = Debug|Win32
- {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.ActiveCfg = Release|Win32
- {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBox2D", "Box2D\proj.win32\Box2D.win32.vcproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "chipmunk\proj.win32\chipmunk.win32.vcproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosDenshion", "CocosDenshion\proj.win32\CocosDenshion.win32.vcproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "cocos2dx\proj.win32\cocos2d-win32.vcproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld\win32\HelloWorld.win32.vcproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}"
+ ProjectSection(ProjectDependencies) = postProject
+ {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\test.win32\test.win32.vcproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
+ {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}
+ {929480E7-23C0-4DF6-8456-096D71547116} = {929480E7-23C0-4DF6-8456-096D71547116}
+ {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32
+ {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
+ {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
+ {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32
+ {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {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
+ {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.Build.0 = Debug|Win32
+ {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.ActiveCfg = Release|Win32
+ {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.Build.0 = Release|Win32
+ {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.Build.0 = Debug|Win32
+ {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.ActiveCfg = Release|Win32
+ {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/cocos2d-win32.vc2010.sln b/cocos2d-win32.vc2010.sln
new file mode 100644
index 000000000000..ae40b5bdb413
--- /dev/null
+++ b/cocos2d-win32.vc2010.sln
@@ -0,0 +1,50 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBox2D", "Box2D\proj.win32\Box2D.win32.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "chipmunk\proj.win32\chipmunk.win32.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosDenshion", "CocosDenshion\proj.win32\CocosDenshion.win32.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "cocos2dx\proj.win32\cocos2d-win32.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld\win32\HelloWorld.win32.vcxproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\test.win32\test.win32.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32
+ {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
+ {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
+ {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32
+ {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {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
+ {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.Build.0 = Debug|Win32
+ {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.ActiveCfg = Release|Win32
+ {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.Build.0 = Release|Win32
+ {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.Build.0 = Debug|Win32
+ {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.ActiveCfg = Release|Win32
+ {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcxproj b/cocos2dx/proj.win32/cocos2d-win32.vcxproj
new file mode 100644
index 000000000000..ca88c889ea9d
--- /dev/null
+++ b/cocos2dx/proj.win32/cocos2d-win32.vcxproj
@@ -0,0 +1,346 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ libcocos2d
+ {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
+ cocos2d-x.win32
+ Win32Proj
+
+
+
+ DynamicLibrary
+ Unicode
+
+
+ DynamicLibrary
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(SolutionDir)$(Configuration).win32\
+ $(Configuration).win32\
+ true
+ $(SolutionDir)$(Configuration).win32\
+ $(Configuration).win32\
+ true
+ AllRules.ruleset
+
+
+ AllRules.ruleset
+
+
+
+
+
+
+
+
+
+ Disabled
+ $(SolutionDir)\cocos2dx\platform;$(SolutionDir)cocos2dx\platform\third_party\win32\iconv;$(SolutionDir)cocos2dx\platform\third_party\win32\zlib;$(SolutionDir)cocos2dx\platform\third_party\win32\libpng;$(SolutionDir)cocos2dx\platform\third_party\win32\libjpeg;$(SolutionDir)cocos2dx\platform\third_party\win32\libxml2;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;..\include;..;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+ 4996;4267;%(DisableSpecificWarnings)
+
+
+ if not exist "$(OutDir)" mkdir "$(OutDir)"
+xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$(OutDir)"
+
+
+ libEGL.lib;libgles_cm.lib;libxml2.lib;libzlib.lib;libpng.lib;libjpeg.lib;libiconv.lib;%(AdditionalDependencies)
+ $(OutDir)$(ProjectName).dll
+ $(OutDir);%(AdditionalLibraryDirectories)
+ false
+ ;%(IgnoreSpecificDefaultLibraries)
+ true
+ Windows
+ $(TargetDir)$(TargetName).lib
+ MachineX86
+
+
+
+
+
+
+
+
+
+
+
+
+ $(SolutionDir)\cocos2dx\platform;$(SolutionDir)cocos2dx\platform\third_party\win32\iconv;$(SolutionDir)cocos2dx\platform\third_party\win32\zlib;$(SolutionDir)cocos2dx\platform\third_party\win32\libpng;$(SolutionDir)cocos2dx\platform\third_party\win32\libjpeg;$(SolutionDir)cocos2dx\platform\third_party\win32\libxml2;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;..\include;..;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+ 4996;4267;%(DisableSpecificWarnings)
+
+
+ if not exist "$(OutDir)" mkdir "$(OutDir)"
+xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$(OutDir)"
+
+
+ libEGL.lib;libgles_cm.lib;libxml2.lib;libzlib.lib;libpng.lib;libjpeg.lib;libiconv.lib;%(AdditionalDependencies)
+ $(OutDir)$(ProjectName).dll
+ $(OutDir);%(AdditionalLibraryDirectories)
+ ;%(IgnoreSpecificDefaultLibraries)
+ true
+ Windows
+ true
+ true
+ $(TargetDir)$(TargetName).lib
+ MachineX86
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters b/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
new file mode 100644
index 000000000000..e01adf7e1212
--- /dev/null
+++ b/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
@@ -0,0 +1,702 @@
+
+
+
+
+ {7714c41e-f26c-4eca-a28b-c2e8828399df}
+
+
+ {b8713560-2596-4f18-a53c-a1ae7304c719}
+
+
+ {87fd26d2-f23e-46f8-b369-e01c20d4f668}
+
+
+ {46467c38-3c10-4176-a8b0-e60bd32fe588}
+
+
+ {e4b0d401-1832-4fb5-ab90-a211d7ce92ca}
+
+
+ {b0e87eea-097f-486a-8d6c-a71682e1eb25}
+
+
+ {f91e3ad0-f275-4744-bdd2-79645fc82493}
+
+
+ {b1c5aeb6-8793-442d-a15d-6a094f182b4c}
+
+
+ {fa8daed2-7c4e-43b5-b635-7b226f101e8c}
+
+
+ {f26b71ad-1a9e-4d0c-97bc-7c5e95be32b4}
+
+
+ {b2c227b0-edb3-49fc-b11c-e03b3ef8d5e0}
+
+
+ {1d71811a-3685-434f-b10e-d580377f1af6}
+
+
+ {c4322f73-5058-41f6-913b-18db9aa1dfba}
+
+
+ {c2f97472-1254-4e99-9778-0e6c7674e390}
+
+
+ {7776f8b7-b04e-4bd1-b356-695134f3927f}
+
+
+ {18d327b4-acaf-4421-b683-9837d92b5488}
+
+
+ {3e1780b2-6a4d-48f0-90ca-e4e0d2613978}
+
+
+ {e1d45f64-9be7-41c5-a657-194780e1b9ea}
+
+
+ {022561bf-a9f5-4d03-b3d3-5178fe3ed572}
+
+
+ {a7e15d3b-0c81-4444-aca0-3d0ede9e2669}
+
+
+ {0cb1e8a6-13ea-4681-a5c8-899a9efb0440}
+
+
+ {b7e6a4ee-f78a-4399-8f56-526294bf8580}
+
+
+ {1b2d8814-d294-4657-be38-4f6d904ad475}
+
+
+
+
+ base_nodes
+
+
+ cocoa
+
+
+ cocoa
+
+
+ cocoa
+
+
+ cocoa
+
+
+ cocoa
+
+
+ cocoa
+
+
+ cocoa
+
+
+ effects
+
+
+ actions
+
+
+ actions
+
+
+ actions
+
+
+ actions
+
+
+ actions
+
+
+ actions
+
+
+ actions
+
+
+ actions
+
+
+ actions
+
+
+ actions
+
+
+ actions
+
+
+ label_nodes
+
+
+ label_nodes
+
+
+ label_nodes
+
+
+ layers_scenes_transitions_nodes
+
+
+ layers_scenes_transitions_nodes
+
+
+ layers_scenes_transitions_nodes
+
+
+ menu_nodes
+
+
+ misc_nodes
+
+
+ misc_nodes
+
+
+ misc_nodes
+
+
+ misc_nodes
+
+
+ particle_nodes
+
+
+ particle_nodes
+
+
+ particle_nodes
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform\win32
+
+
+ platform\win32
+
+
+ platform\win32
+
+
+ platform\win32
+
+
+ sprite_nodes
+
+
+ sprite_nodes
+
+
+ sprite_nodes
+
+
+ sprite_nodes
+
+
+ sprite_nodes
+
+
+ sprite_nodes
+
+
+ sprite_nodes
+
+
+ support
+
+
+ support
+
+
+ support
+
+
+ support
+
+
+ support
+
+
+ support\image_support
+
+
+ support\zip_support
+
+
+ support\zip_support
+
+
+ support\zip_support
+
+
+ support\file_support
+
+
+ textures
+
+
+ textures
+
+
+ textures
+
+
+ textures
+
+
+ tileMap_parallax_nodes
+
+
+ tileMap_parallax_nodes
+
+
+ tileMap_parallax_nodes
+
+
+ tileMap_parallax_nodes
+
+
+ tileMap_parallax_nodes
+
+
+ tileMap_parallax_nodes
+
+
+ touch_dispatcher
+
+
+ touch_dispatcher
+
+
+ keypad_dispatcher
+
+
+ keypad_dispatcher
+
+
+ event_dispatcher
+
+
+ event_dispatcher
+
+
+ event_dispatcher
+
+
+
+
+
+
+
+
+
+ effects
+
+
+ effects
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform
+
+
+ platform\win32
+
+
+ platform\win32
+
+
+ platform\win32
+
+
+ platform\win32
+
+
+ support
+
+
+ support
+
+
+ support
+
+
+ support
+
+
+ support\data_support
+
+
+ support\data_support
+
+
+ support\data_support
+
+
+ support\image_support
+
+
+ support\zip_support
+
+
+ support\zip_support
+
+
+ support\zip_support
+
+
+ support\file_support
+
+
+ touch_dispatcher
+
+
+
+
\ No newline at end of file
diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcxproj.user b/cocos2dx/proj.win32/cocos2d-win32.vcxproj.user
new file mode 100644
index 000000000000..3f030911244a
--- /dev/null
+++ b/cocos2dx/proj.win32/cocos2d-win32.vcxproj.user
@@ -0,0 +1,6 @@
+
+
+
+ false
+
+
\ No newline at end of file
diff --git a/cocos2dx/support/file_support/FileUtils.cpp b/cocos2dx/support/file_support/FileUtils.cpp
index 31cef51f71d5..4b8c63feebe1 100644
--- a/cocos2dx/support/file_support/FileUtils.cpp
+++ b/cocos2dx/support/file_support/FileUtils.cpp
@@ -45,7 +45,7 @@ unsigned char* FileUtils::getFileData(const char* pszFileName, const char* pszMo
*pSize = ftell(fp);
fseek(fp,0,SEEK_SET);
Buffer = new unsigned char[*pSize];
- fread(Buffer,sizeof(unsigned char), *pSize,fp);
+ *pSize = fread(Buffer,sizeof(unsigned char), *pSize,fp);
fclose(fp);
} while (0);
diff --git a/tests/test.win32/copy_res.bat b/tests/test.win32/copy_res.bat
index aa75a6102eda..d4fea1aa47e2 100644
--- a/tests/test.win32/copy_res.bat
+++ b/tests/test.win32/copy_res.bat
@@ -1,2 +1,2 @@
echo off
-xcopy /E /Y ..\Res\*.* %1
+xcopy /E /Y /Q ..\Res\*.* %1
diff --git a/tests/test.win32/test.win32.vcxproj b/tests/test.win32/test.win32.vcxproj
new file mode 100644
index 000000000000..54cabddd0424
--- /dev/null
+++ b/tests/test.win32/test.win32.vcxproj
@@ -0,0 +1,270 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ tests
+ {76A39BB2-9B84-4C65-98A5-654D86B86F2A}
+ test_win32
+ Win32Proj
+
+
+
+ Application
+ Unicode
+ true
+
+
+ Application
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(SolutionDir)$(Configuration).win32\
+ $(Configuration).win32\
+ true
+ $(SolutionDir)$(Configuration).win32\
+ $(Configuration).win32\
+ false
+ AllRules.ruleset
+
+
+ AllRules.ruleset
+
+
+
+
+
+ Disabled
+ $(SolutionDir)cocos2dx\platform;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\include;$(SolutionDir);$(SolutionDir)chipmunk\include\chipmunk;$(SolutionDir)CocosDenshion\include;..\tests;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;..\;.\;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+ 4244;4996;%(DisableSpecificWarnings)
+
+
+ libcocos2d.lib;libgles_cm.lib;libBox2d.lib;libchipmunk.lib;%(AdditionalDependencies)
+ $(OutDir)$(ProjectName).exe
+ $(OutDir);%(AdditionalLibraryDirectories)
+ true
+ Windows
+ MachineX86
+
+
+ copy_res.bat "$(OutDir)"
+
+
+
+
+ MaxSpeed
+ true
+ $(SolutionDir)cocos2dx\platform;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\include;$(SolutionDir);$(SolutionDir)chipmunk\include\chipmunk;$(SolutionDir)CocosDenshion\include;..\tests;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;..\;.\;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ ProgramDatabase
+ 4244;4996;%(DisableSpecificWarnings)
+
+
+ libcocos2d.lib;libgles_cm.lib;libBox2d.lib;libchipmunk.lib;%(AdditionalDependencies)
+ $(OutDir)$(ProjectName).exe
+ $(OutDir);%(AdditionalLibraryDirectories)
+ true
+ Windows
+ true
+ true
+ MachineX86
+
+
+ copy_res.bat "$(OutDir)"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {929480e7-23c0-4df6-8456-096d71547116}
+ false
+
+
+ {207bc7a9-ccf1-4f2f-a04d-45f72242ae25}
+ false
+
+
+ {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}
+ false
+
+
+ {f8edd7fa-9a51-4e80-baeb-860825d2eac6}
+ false
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tests/test.win32/test.win32.vcxproj.filters b/tests/test.win32/test.win32.vcxproj.filters
new file mode 100644
index 000000000000..841deb0e42a0
--- /dev/null
+++ b/tests/test.win32/test.win32.vcxproj.filters
@@ -0,0 +1,522 @@
+
+
+
+
+ {2cec4d5a-4891-4389-89d2-ba9378e256f7}
+
+
+ {faa8929c-ade9-471b-9c80-56831406176c}
+
+
+ {5ba42913-895a-4779-8213-bfc0ec797e90}
+
+
+ {64f7afe1-c2ad-4fcd-8513-198339885f03}
+
+
+ {9bd3d520-87d0-4675-9d3c-a4c7a0c06326}
+
+
+ {17ae5ce8-b14d-463d-a0b8-a3b1859e9247}
+
+
+ {d0d49daf-d65e-4fe3-a9e9-7fbe7dcc7cf6}
+
+
+ {a2aa5794-8ba0-488e-a6fa-8347b186fb9a}
+
+
+ {1ca5bba5-501c-46f5-987d-9a3533862c5a}
+
+
+ {e335751b-5dcb-4eec-99b1-d6ad22f41283}
+
+
+ {5d5f105c-4606-4ff3-8c2c-fa40c97c7455}
+
+
+ {dc9fbea5-0e82-4a63-a9ad-40b6d17d4b2e}
+
+
+ {2f2bbcff-0476-4ea7-ab87-a28db650f8a3}
+
+
+ {92d7fa0a-f213-4eb5-b151-ff5306f75f13}
+
+
+ {47db567d-8983-42a2-a1c5-2120481917ec}
+
+
+ {23eb4bf9-4c4a-4c6b-9145-48f40e70d3ea}
+
+
+ {580d9270-2425-4941-a977-19ba1bd90259}
+
+
+ {286b95b7-2676-4ad7-a087-670fc2c9eeb5}
+
+
+ {1d32d076-7281-4109-a6b5-55e4fbb35cf6}
+
+
+ {788f7771-109f-4799-8e1a-594463e2f078}
+
+
+ {573b6ad6-9507-4123-8b89-9bb3306e64b9}
+
+
+ {a8c4b0de-5f98-4e91-a90a-d073aa72cea1}
+
+
+ {d9262dd1-dbfb-44dc-96f4-caad50534493}
+
+
+ {57b8de1b-7456-42aa-84ba-2fd6968ecebf}
+
+
+ {42deb7b3-bcf7-45b5-af1d-7d8a2446d6a8}
+
+
+ {c488edbb-0efa-49bd-b11a-9fdd0e804c13}
+
+
+ {c3d97594-3aa5-4141-b15a-2bef2234715b}
+
+
+ {b409c303-1741-4b63-9de6-9b7ba0272aca}
+
+
+ {1ab75926-9b16-459f-b487-00718c5f0f1e}
+
+
+ {17cbd28c-8ddf-4115-826d-260c8061cc89}
+
+
+ {a07ca7fd-87da-4f23-b730-5f13e3bebcb7}
+
+
+ {468296d3-436a-43ee-b418-80264f03ee81}
+
+
+ {1e8965a5-84b4-4121-a9ee-35d9eeba7d55}
+
+
+ {5c7f2b12-3faa-4f4e-abef-eb69ea6ff064}
+
+
+
+
+ win32
+
+
+ classes
+
+
+ classes\tests
+
+
+ classes\tests
+
+
+ classes\tests\ActionsTest
+
+
+ classes\tests\TransitionsTest
+
+
+ classes\tests\ProgressActionsTest
+
+
+ classes\tests\EffectsTest
+
+
+ classes\tests\ClickAndMoveTest
+
+
+ classes\tests\RotateWorldTest
+
+
+ classes\tests\ParticleTest
+
+
+ classes\tests\EaseActionsTest
+
+
+ classes\tests\MotionStreakTest
+
+
+ classes\tests\DrawPrimitivesTest
+
+
+ classes\tests\CocosNodeTest
+
+
+ classes\tests\TouchesTest
+
+
+ classes\tests\TouchesTest
+
+
+ classes\tests\TouchesTest
+
+
+ classes\tests\MenuTest
+
+
+ classes\tests\ActionManagerTest
+
+
+ classes\tests\LayerTest
+
+
+ classes\tests\SceneTest
+
+
+ classes\tests\ParallaxTest
+
+
+ classes\tests\TileMapTest
+
+
+ classes\tests\IntervalTest
+
+
+ classes\tests\LabelTest
+
+
+ classes\tests\SpriteTest
+
+
+ classes\tests\SchedulerTest
+
+
+ classes\tests\RenderTextureTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\Box2dTest
+
+
+ classes\tests\Box2DTestBed
+
+
+ classes\tests\Box2DTestBed
+
+
+ classes\tests\Box2DTestBed
+
+
+ classes\tests\Box2DTestBed
+
+
+ classes\tests\EffectsAdvancedTest
+
+
+ classes\tests\HiResTest
+
+
+ classes\tests\KeypadTest
+
+
+ classes\tests\CocosDenshionTest
+
+
+
+
+ win32
+
+
+ classes
+
+
+ classes\tests
+
+
+ classes\tests
+
+
+ classes\tests
+
+
+ classes\tests
+
+
+ classes\tests\ActionsTest
+
+
+ classes\tests\TransitionsTest
+
+
+ classes\tests\ProgressActionsTest
+
+
+ classes\tests\EffectsTest
+
+
+ classes\tests\ClickAndMoveTest
+
+
+ classes\tests\RotateWorldTest
+
+
+ classes\tests\ParticleTest
+
+
+ classes\tests\EaseActionsTest
+
+
+ classes\tests\MotionStreakTest
+
+
+ classes\tests\DrawPrimitivesTest
+
+
+ classes\tests\CocosNodeTest
+
+
+ classes\tests\TouchesTest
+
+
+ classes\tests\TouchesTest
+
+
+ classes\tests\TouchesTest
+
+
+ classes\tests\MenuTest
+
+
+ classes\tests\ActionManagerTest
+
+
+ classes\tests\LayerTest
+
+
+ classes\tests\SceneTest
+
+
+ classes\tests\ParallaxTest
+
+
+ classes\tests\TileMapTest
+
+
+ classes\tests\IntervalTest
+
+
+ classes\tests\LabelTest
+
+
+ classes\tests\SpriteTest
+
+
+ classes\tests\SchedulerTest
+
+
+ classes\tests\RenderTextureTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\ChipmunkTest
+
+
+ classes\tests\Box2dTest
+
+
+ classes\tests\Box2DTestBed
+
+
+ classes\tests\Box2DTestBed
+
+
+ classes\tests\Box2DTestBed
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\Box2DTestBed\Tests
+
+
+ classes\tests\EffectsAdvancedTest
+
+
+ classes\tests\HiResTest
+
+
+ classes\tests\KeypadTest
+
+
+ classes\tests\CocosDenshionTest
+
+
+
\ No newline at end of file
diff --git a/tests/test.win32/test.win32.vcxproj.user b/tests/test.win32/test.win32.vcxproj.user
new file mode 100644
index 000000000000..3f030911244a
--- /dev/null
+++ b/tests/test.win32/test.win32.vcxproj.user
@@ -0,0 +1,6 @@
+
+
+
+ false
+
+
\ No newline at end of file