Skip to content

Commit e5dcaab

Browse files
xiaofeng11xiaofeng11
committed
Merge branch 'v2' of github.com:xiaofeng11/cocos2d-x into v2
2 parents a72a992 + 78e96c3 commit e5dcaab

File tree

6 files changed

+24
-0
lines changed

6 files changed

+24
-0
lines changed

‎extensions/proj.winrt/libExtensions.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<ClCompile Include="..\CocoStudio\Armature\utils\CCTransformHelp.cpp" />
8484
<ClCompile Include="..\CocoStudio\Armature\utils\CCTweenFunction.cpp" />
8585
<ClCompile Include="..\CocoStudio\Armature\utils\CCUtilMath.cpp" />
86+
<ClCompile Include="..\CocoStudio\CocoStudio.cpp" />
8687
<ClCompile Include="..\CocoStudio\Components\CCComAttribute.cpp" />
8788
<ClCompile Include="..\CocoStudio\Components\CCComAudio.cpp" />
8889
<ClCompile Include="..\CocoStudio\Components\CCComController.cpp" />
@@ -256,6 +257,7 @@
256257
<ClInclude Include="..\CocoStudio\Armature\utils\CCTransformHelp.h" />
257258
<ClInclude Include="..\CocoStudio\Armature\utils\CCTweenFunction.h" />
258259
<ClInclude Include="..\CocoStudio\Armature\utils\CCUtilMath.h" />
260+
<ClInclude Include="..\CocoStudio\CocoStudio.h" />
259261
<ClInclude Include="..\CocoStudio\Components\CCComAttribute.h" />
260262
<ClInclude Include="..\CocoStudio\Components\CCComAudio.h" />
261263
<ClInclude Include="..\CocoStudio\Components\CCComBase.h" />

‎extensions/proj.winrt/libExtensions.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,9 @@
572572
<ClCompile Include="..\CocoStudio\ActionTimeline\CCTimeLine.cpp">
573573
<Filter>CocoStudio\ActionTimeline</Filter>
574574
</ClCompile>
575+
<ClCompile Include="..\CocoStudio\CocoStudio.cpp">
576+
<Filter>CocoStudio</Filter>
577+
</ClCompile>
575578
</ItemGroup>
576579
<ItemGroup>
577580
<ClInclude Include="..\AssetsManager\AssetsManager.h">
@@ -1086,5 +1089,8 @@
10861089
<ClInclude Include="..\CocoStudio\ActionTimeline\CCTimelineMacro.h">
10871090
<Filter>CocoStudio\ActionTimeline</Filter>
10881091
</ClInclude>
1092+
<ClInclude Include="..\CocoStudio\CocoStudio.h">
1093+
<Filter>CocoStudio</Filter>
1094+
</ClInclude>
10891095
</ItemGroup>
10901096
</Project>

‎extensions/proj.winrt/libExtensions_2013.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<ClCompile Include="..\CocoStudio\Armature\utils\CCTransformHelp.cpp" />
8484
<ClCompile Include="..\CocoStudio\Armature\utils\CCTweenFunction.cpp" />
8585
<ClCompile Include="..\CocoStudio\Armature\utils\CCUtilMath.cpp" />
86+
<ClCompile Include="..\CocoStudio\CocoStudio.cpp" />
8687
<ClCompile Include="..\CocoStudio\Components\CCComAttribute.cpp" />
8788
<ClCompile Include="..\CocoStudio\Components\CCComAudio.cpp" />
8889
<ClCompile Include="..\CocoStudio\Components\CCComController.cpp" />
@@ -256,6 +257,7 @@
256257
<ClInclude Include="..\CocoStudio\Armature\utils\CCTransformHelp.h" />
257258
<ClInclude Include="..\CocoStudio\Armature\utils\CCTweenFunction.h" />
258259
<ClInclude Include="..\CocoStudio\Armature\utils\CCUtilMath.h" />
260+
<ClInclude Include="..\CocoStudio\CocoStudio.h" />
259261
<ClInclude Include="..\CocoStudio\Components\CCComAttribute.h" />
260262
<ClInclude Include="..\CocoStudio\Components\CCComAudio.h" />
261263
<ClInclude Include="..\CocoStudio\Components\CCComBase.h" />

‎extensions/proj.winrt/libExtensions_2013.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,9 @@
572572
<ClCompile Include="..\CocoStudio\ActionTimeline\CCTimeLine.cpp">
573573
<Filter>CocoStudio\ActionTimeline</Filter>
574574
</ClCompile>
575+
<ClCompile Include="..\CocoStudio\CocoStudio.cpp">
576+
<Filter>CocoStudio</Filter>
577+
</ClCompile>
575578
</ItemGroup>
576579
<ItemGroup>
577580
<ClInclude Include="..\AssetsManager\AssetsManager.h">
@@ -1073,5 +1076,8 @@
10731076
<ClInclude Include="..\CocoStudio\ActionTimeline\CCTimelineMacro.h">
10741077
<Filter>CocoStudio\ActionTimeline</Filter>
10751078
</ClInclude>
1079+
<ClInclude Include="..\CocoStudio\CocoStudio.h">
1080+
<Filter>CocoStudio</Filter>
1081+
</ClInclude>
10761082
</ItemGroup>
10771083
</Project>

‎extensions/proj.wp8/libExtensions.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@
224224
<ClCompile Include="..\CocoStudio\Armature\utils\CCTransformHelp.cpp" />
225225
<ClCompile Include="..\CocoStudio\Armature\utils\CCTweenFunction.cpp" />
226226
<ClCompile Include="..\CocoStudio\Armature\utils\CCUtilMath.cpp" />
227+
<ClCompile Include="..\CocoStudio\CocoStudio.cpp" />
227228
<ClCompile Include="..\CocoStudio\Components\CCComAttribute.cpp" />
228229
<ClCompile Include="..\CocoStudio\Components\CCComAudio.cpp" />
229230
<ClCompile Include="..\CocoStudio\Components\CCComController.cpp" />
@@ -386,6 +387,7 @@
386387
<ClInclude Include="..\CocoStudio\Armature\utils\CCTransformHelp.h" />
387388
<ClInclude Include="..\CocoStudio\Armature\utils\CCTweenFunction.h" />
388389
<ClInclude Include="..\CocoStudio\Armature\utils\CCUtilMath.h" />
390+
<ClInclude Include="..\CocoStudio\CocoStudio.h" />
389391
<ClInclude Include="..\CocoStudio\Components\CCComAttribute.h" />
390392
<ClInclude Include="..\CocoStudio\Components\CCComAudio.h" />
391393
<ClInclude Include="..\CocoStudio\Components\CCComBase.h" />

‎extensions/proj.wp8/libExtensions.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,9 @@
584584
<ClCompile Include="..\CocoStudio\ActionTimeline\CCTimeLine.cpp">
585585
<Filter>CocoStudio\ActionTimeLine</Filter>
586586
</ClCompile>
587+
<ClCompile Include="..\CocoStudio\CocoStudio.cpp">
588+
<Filter>CocoStudio</Filter>
589+
</ClCompile>
587590
</ItemGroup>
588591
<ItemGroup>
589592
<ClInclude Include="..\AssetsManager\AssetsManager.h">
@@ -1107,5 +1110,8 @@
11071110
<ClInclude Include="..\CocoStudio\ActionTimeline\CCTimelineMacro.h">
11081111
<Filter>CocoStudio\ActionTimeLine</Filter>
11091112
</ClInclude>
1113+
<ClInclude Include="..\CocoStudio\CocoStudio.h">
1114+
<Filter>CocoStudio</Filter>
1115+
</ClInclude>
11101116
</ItemGroup>
11111117
</Project>

0 commit comments

Comments
 (0)