Skip to content

Commit 53fff19

Browse files
author
minggo
committed
Merge pull request cocos2d#393 from minggo/master
[win32] modify for vs2010
2 parents fdabd8a + ee34566 commit 53fff19

File tree

4 files changed

+107
-9
lines changed

4 files changed

+107
-9
lines changed

‎cocos2dx/proj.win32/cocos2d-win32.vcxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
184184
<ClCompile Include="..\sprite_nodes\CCSpriteBatchNode.cpp" />
185185
<ClCompile Include="..\sprite_nodes\CCSpriteFrame.cpp" />
186186
<ClCompile Include="..\sprite_nodes\CCSpriteFrameCache.cpp" />
187-
<ClCompile Include="..\sprite_nodes\CCSpriteSheet.cpp" />
188187
<ClCompile Include="..\support\base64.cpp" />
189188
<ClCompile Include="..\support\CCArray.cpp" />
190189
<ClCompile Include="..\support\CCPointExtension.cpp" />
@@ -287,7 +286,6 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
287286
<ClInclude Include="..\include\CCSpriteBatchNode.h" />
288287
<ClInclude Include="..\include\CCSpriteFrame.h" />
289288
<ClInclude Include="..\include\CCSpriteFrameCache.h" />
290-
<ClInclude Include="..\include\CCSpriteSheet.h" />
291289
<ClInclude Include="..\include\CCString.h" />
292290
<ClInclude Include="..\include\CCTextFieldTTF.h" />
293291
<ClInclude Include="..\include\CCTexture2D.h" />

‎cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,6 @@
243243
<ClCompile Include="..\sprite_nodes\CCSpriteFrameCache.cpp">
244244
<Filter>sprite_nodes</Filter>
245245
</ClCompile>
246-
<ClCompile Include="..\sprite_nodes\CCSpriteSheet.cpp">
247-
<Filter>sprite_nodes</Filter>
248-
</ClCompile>
249246
<ClCompile Include="..\support\base64.cpp">
250247
<Filter>support</Filter>
251248
</ClCompile>
@@ -536,9 +533,6 @@
536533
<ClInclude Include="..\include\CCSpriteFrameCache.h">
537534
<Filter>include</Filter>
538535
</ClInclude>
539-
<ClInclude Include="..\include\CCSpriteSheet.h">
540-
<Filter>include</Filter>
541-
</ClInclude>
542536
<ClInclude Include="..\include\CCString.h">
543537
<Filter>include</Filter>
544538
</ClInclude>

‎tests/test.win32/test.win32.vcxproj

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
5151
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
5252
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
53+
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
5354
</PropertyGroup>
5455
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5556
<ClCompile>
@@ -66,7 +67,7 @@
6667
<DisableSpecificWarnings>4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
6768
</ClCompile>
6869
<Link>
69-
<AdditionalDependencies>libcocos2d.lib;libgles_cm.lib;libBox2d.lib;libchipmunk.lib;libcurl_imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
70+
<AdditionalDependencies>libcocos2d.lib;libgles_cm.lib;libBox2d.lib;libchipmunk.lib;libcurl_imp.lib;libCocosDenshion.lib;%(AdditionalDependencies)</AdditionalDependencies>
7071
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
7172
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
7273
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -108,6 +109,18 @@
108109
</PostBuildEvent>
109110
</ItemDefinitionGroup>
110111
<ItemGroup>
112+
<ClCompile Include="..\tests\BugsTest\Bug-1159.cpp" />
113+
<ClCompile Include="..\tests\BugsTest\Bug-1174.cpp" />
114+
<ClCompile Include="..\tests\BugsTest\Bug-350.cpp" />
115+
<ClCompile Include="..\tests\BugsTest\Bug-422.cpp" />
116+
<ClCompile Include="..\tests\BugsTest\Bug-458\Bug-458.cpp" />
117+
<ClCompile Include="..\tests\BugsTest\Bug-458\QuestionContainerSprite.cpp" />
118+
<ClCompile Include="..\tests\BugsTest\Bug-624.cpp" />
119+
<ClCompile Include="..\tests\BugsTest\Bug-886.cpp" />
120+
<ClCompile Include="..\tests\BugsTest\Bug-899.cpp" />
121+
<ClCompile Include="..\tests\BugsTest\Bug-914.cpp" />
122+
<ClCompile Include="..\tests\BugsTest\BugsTest.cpp" />
123+
<ClCompile Include="..\tests\DirectorTest\DirectorTest.cpp" />
111124
<ClCompile Include="main.cpp" />
112125
<ClCompile Include="..\AppDelegate.cpp" />
113126
<ClCompile Include="..\tests\controller.cpp" />
@@ -179,6 +192,18 @@
179192
<ClCompile Include="..\tests\UserDefaultTest\UserDefaultTest.cpp" />
180193
</ItemGroup>
181194
<ItemGroup>
195+
<ClInclude Include="..\tests\BugsTest\Bug-1159.h" />
196+
<ClInclude Include="..\tests\BugsTest\Bug-1174.h" />
197+
<ClInclude Include="..\tests\BugsTest\Bug-350.h" />
198+
<ClInclude Include="..\tests\BugsTest\Bug-422.h" />
199+
<ClInclude Include="..\tests\BugsTest\Bug-458\Bug-458.h" />
200+
<ClInclude Include="..\tests\BugsTest\Bug-458\QuestionContainerSprite.h" />
201+
<ClInclude Include="..\tests\BugsTest\Bug-624.h" />
202+
<ClInclude Include="..\tests\BugsTest\Bug-886.h" />
203+
<ClInclude Include="..\tests\BugsTest\Bug-899.h" />
204+
<ClInclude Include="..\tests\BugsTest\Bug-914.h" />
205+
<ClInclude Include="..\tests\BugsTest\BugsTest.h" />
206+
<ClInclude Include="..\tests\DirectorTest\DirectorTest.h" />
182207
<ClInclude Include="main.h" />
183208
<ClInclude Include="..\AppDelegate.h" />
184209
<ClInclude Include="..\tests\controller.h" />

‎tests/test.win32/test.win32.vcxproj.filters

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,15 @@
118118
<Filter Include="classes\tests\UserDefaultTest">
119119
<UniqueIdentifier>{25cf805e-be4e-440a-924b-354b3c064cc9}</UniqueIdentifier>
120120
</Filter>
121+
<Filter Include="classes\tests\BugsTest">
122+
<UniqueIdentifier>{a470f805-a61e-4e0d-96fa-2933ade351e3}</UniqueIdentifier>
123+
</Filter>
124+
<Filter Include="classes\tests\BugsTest\Bug-458">
125+
<UniqueIdentifier>{858c5109-0abf-42db-9fa8-33d44063c1af}</UniqueIdentifier>
126+
</Filter>
127+
<Filter Include="classes\tests\DirectorTest">
128+
<UniqueIdentifier>{4621182d-8908-4538-9b77-9e1da1233300}</UniqueIdentifier>
129+
</Filter>
121130
</ItemGroup>
122131
<ItemGroup>
123132
<ClCompile Include="main.cpp">
@@ -327,6 +336,42 @@
327336
<ClCompile Include="..\tests\UserDefaultTest\UserDefaultTest.cpp">
328337
<Filter>classes\tests\UserDefaultTest</Filter>
329338
</ClCompile>
339+
<ClCompile Include="..\tests\BugsTest\Bug-350.cpp">
340+
<Filter>classes\tests\BugsTest</Filter>
341+
</ClCompile>
342+
<ClCompile Include="..\tests\BugsTest\Bug-422.cpp">
343+
<Filter>classes\tests\BugsTest</Filter>
344+
</ClCompile>
345+
<ClCompile Include="..\tests\BugsTest\Bug-624.cpp">
346+
<Filter>classes\tests\BugsTest</Filter>
347+
</ClCompile>
348+
<ClCompile Include="..\tests\BugsTest\Bug-886.cpp">
349+
<Filter>classes\tests\BugsTest</Filter>
350+
</ClCompile>
351+
<ClCompile Include="..\tests\BugsTest\Bug-899.cpp">
352+
<Filter>classes\tests\BugsTest</Filter>
353+
</ClCompile>
354+
<ClCompile Include="..\tests\BugsTest\Bug-914.cpp">
355+
<Filter>classes\tests\BugsTest</Filter>
356+
</ClCompile>
357+
<ClCompile Include="..\tests\BugsTest\Bug-1159.cpp">
358+
<Filter>classes\tests\BugsTest</Filter>
359+
</ClCompile>
360+
<ClCompile Include="..\tests\BugsTest\Bug-1174.cpp">
361+
<Filter>classes\tests\BugsTest</Filter>
362+
</ClCompile>
363+
<ClCompile Include="..\tests\BugsTest\BugsTest.cpp">
364+
<Filter>classes\tests\BugsTest</Filter>
365+
</ClCompile>
366+
<ClCompile Include="..\tests\BugsTest\Bug-458\Bug-458.cpp">
367+
<Filter>classes\tests\BugsTest\Bug-458</Filter>
368+
</ClCompile>
369+
<ClCompile Include="..\tests\BugsTest\Bug-458\QuestionContainerSprite.cpp">
370+
<Filter>classes\tests\BugsTest\Bug-458</Filter>
371+
</ClCompile>
372+
<ClCompile Include="..\tests\DirectorTest\DirectorTest.cpp">
373+
<Filter>classes\tests\DirectorTest</Filter>
374+
</ClCompile>
330375
</ItemGroup>
331376
<ItemGroup>
332377
<ClInclude Include="main.h">
@@ -596,5 +641,41 @@
596641
<ClInclude Include="..\tests\UserDefaultTest\UserDefaultTest.h">
597642
<Filter>classes\tests\UserDefaultTest</Filter>
598643
</ClInclude>
644+
<ClInclude Include="..\tests\BugsTest\BugsTest.h">
645+
<Filter>classes\tests\BugsTest</Filter>
646+
</ClInclude>
647+
<ClInclude Include="..\tests\BugsTest\Bug-350.h">
648+
<Filter>classes\tests\BugsTest</Filter>
649+
</ClInclude>
650+
<ClInclude Include="..\tests\BugsTest\Bug-422.h">
651+
<Filter>classes\tests\BugsTest</Filter>
652+
</ClInclude>
653+
<ClInclude Include="..\tests\BugsTest\Bug-624.h">
654+
<Filter>classes\tests\BugsTest</Filter>
655+
</ClInclude>
656+
<ClInclude Include="..\tests\BugsTest\Bug-886.h">
657+
<Filter>classes\tests\BugsTest</Filter>
658+
</ClInclude>
659+
<ClInclude Include="..\tests\BugsTest\Bug-899.h">
660+
<Filter>classes\tests\BugsTest</Filter>
661+
</ClInclude>
662+
<ClInclude Include="..\tests\BugsTest\Bug-914.h">
663+
<Filter>classes\tests\BugsTest</Filter>
664+
</ClInclude>
665+
<ClInclude Include="..\tests\BugsTest\Bug-1159.h">
666+
<Filter>classes\tests\BugsTest</Filter>
667+
</ClInclude>
668+
<ClInclude Include="..\tests\BugsTest\Bug-1174.h">
669+
<Filter>classes\tests\BugsTest</Filter>
670+
</ClInclude>
671+
<ClInclude Include="..\tests\BugsTest\Bug-458\Bug-458.h">
672+
<Filter>classes\tests\BugsTest\Bug-458</Filter>
673+
</ClInclude>
674+
<ClInclude Include="..\tests\BugsTest\Bug-458\QuestionContainerSprite.h">
675+
<Filter>classes\tests\BugsTest\Bug-458</Filter>
676+
</ClInclude>
677+
<ClInclude Include="..\tests\DirectorTest\DirectorTest.h">
678+
<Filter>classes\tests\DirectorTest</Filter>
679+
</ClInclude>
599680
</ItemGroup>
600681
</Project>

0 commit comments

Comments
 (0)