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

completed multiplatform projects

This commit is contained in:
yusheng.lu 2014-12-22 19:39:10 +08:00
parent b0bfc2906a
commit 02b9269cff
9 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/2d/libcocos2d.vcxproj
View File

@ -362,7 +362,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClCompile Include="..\editor-support\cocostudio\TriggerMng.cpp" /> <ClCompile Include="..\editor-support\cocostudio\TriggerMng.cpp" />
<ClCompile Include="..\editor-support\cocostudio\TriggerObj.cpp" /> <ClCompile Include="..\editor-support\cocostudio\TriggerObj.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.cpp" /> <ClCompile Include="..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\ArmatureNode\ArmatureNodeReader.cpp" /> <ClCompile Include="..\editor-support\cocostudio\WidgetReader\ArmatureNodeReader\ArmatureNodeReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.cpp" /> <ClCompile Include="..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.cpp" /> <ClCompile Include="..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\ComAudioReader\ComAudioReader.cpp" /> <ClCompile Include="..\editor-support\cocostudio\WidgetReader\ComAudioReader\ComAudioReader.cpp" />
@ -766,8 +766,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClInclude Include="..\editor-support\cocostudio\TriggerMng.h" /> <ClInclude Include="..\editor-support\cocostudio\TriggerMng.h" />
<ClInclude Include="..\editor-support\cocostudio\TriggerObj.h" /> <ClInclude Include="..\editor-support\cocostudio\TriggerObj.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.h" /> <ClInclude Include="..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ArmatureNode\ArmatureNodeReader.h" /> <ClInclude Include="..\editor-support\cocostudio\WidgetReader\ArmatureNodeReader\ArmatureNodeReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ArmatureNode\CSArmatureNode_generated.h" /> <ClInclude Include="..\editor-support\cocostudio\WidgetReader\ArmatureNodeReader\CSArmatureNode_generated.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.h" /> <ClInclude Include="..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.h" /> <ClInclude Include="..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ComAudioReader\ComAudioReader.h" /> <ClInclude Include="..\editor-support\cocostudio\WidgetReader\ComAudioReader\ComAudioReader.h" />

14
cocos/2d/libcocos2d.vcxproj.filters
View File

@ -241,7 +241,7 @@
<Filter Include="base\allocator"> <Filter Include="base\allocator">
<UniqueIdentifier>{92ff4e66-3943-47da-a439-c8f182bb871a}</UniqueIdentifier> <UniqueIdentifier>{92ff4e66-3943-47da-a439-c8f182bb871a}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="cocostudio\reader\WidgetReader\ArmatureNode"> <Filter Include="cocostudio\reader\WidgetReader\ArmatureNodeReader">
<UniqueIdentifier>{e1848cce-b225-42c4-bb6e-6430b6da123b}</UniqueIdentifier> <UniqueIdentifier>{e1848cce-b225-42c4-bb6e-6430b6da123b}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
@ -1304,8 +1304,8 @@
<ClCompile Include="..\base\allocator\CCAllocatorGlobalNewDelete.cpp"> <ClCompile Include="..\base\allocator\CCAllocatorGlobalNewDelete.cpp">
<Filter>base\allocator</Filter> <Filter>base\allocator</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\ArmatureNode\ArmatureNodeReader.cpp"> <ClCompile Include="..\editor-support\cocostudio\WidgetReader\ArmatureNodeReader\ArmatureNodeReader.cpp">
<Filter>cocostudio\reader\WidgetReader\ArmatureNode</Filter> <Filter>cocostudio\reader\WidgetReader\ArmatureNodeReader</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -2550,11 +2550,11 @@
<ClInclude Include="..\base\allocator\CCAllocatorStrategyPool.h"> <ClInclude Include="..\base\allocator\CCAllocatorStrategyPool.h">
<Filter>base\allocator</Filter> <Filter>base\allocator</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ArmatureNode\ArmatureNodeReader.h"> <ClInclude Include="..\editor-support\cocostudio\WidgetReader\ArmatureNodeReader\ArmatureNodeReader.h">
<Filter>cocostudio\reader\WidgetReader\ArmatureNode</Filter> <Filter>cocostudio\reader\WidgetReader\ArmatureNodeReader</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ArmatureNode\CSArmatureNode_generated.h"> <ClInclude Include="..\editor-support\cocostudio\WidgetReader\ArmatureNodeReader\CSArmatureNode_generated.h">
<Filter>cocostudio\reader\WidgetReader\ArmatureNode</Filter> <Filter>cocostudio\reader\WidgetReader\ArmatureNodeReader</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
View File

@ -230,6 +230,8 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\TriggerMng.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\TriggerMng.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\TriggerObj.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\TriggerObj.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ArmatureNode\ArmatureNodeReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ArmatureNode\CSArmatureNode_generated.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ComAudioReader\ComAudioReader.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ComAudioReader\ComAudioReader.h" />
@ -632,6 +634,7 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\TriggerMng.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\TriggerMng.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\TriggerObj.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\TriggerObj.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ArmatureNode\ArmatureNodeReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ComAudioReader\ComAudioReader.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ComAudioReader\ComAudioReader.cpp" />

12
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
View File

@ -1258,6 +1258,12 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ProjectNodeReader\ProjectNodeReader.h"> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ProjectNodeReader\ProjectNodeReader.h">
<Filter>cocostudio\reader\WidgetReader\ProjectNodeReader</Filter> <Filter>cocostudio\reader\WidgetReader\ProjectNodeReader</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ArmatureNode\ArmatureNodeReader.h">
<Filter>cocostudio\reader\WidgetReader\ArmatureNode</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ArmatureNode\CSArmatureNode_generated.h">
<Filter>cocostudio\reader\WidgetReader\ArmatureNode</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos2d.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos2d.cpp" />
@ -2330,6 +2336,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ProjectNodeReader\ProjectNodeReader.cpp"> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ProjectNodeReader\ProjectNodeReader.cpp">
<Filter>cocostudio\reader\WidgetReader\ProjectNodeReader</Filter> <Filter>cocostudio\reader\WidgetReader\ProjectNodeReader</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ArmatureNode\ArmatureNodeReader.cpp">
<Filter>cocostudio\reader\WidgetReader\ArmatureNode</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="2d"> <Filter Include="2d">
@ -2560,6 +2569,9 @@
<Filter Include="cocostudio\reader\WidgetReader\ProjectNodeReader"> <Filter Include="cocostudio\reader\WidgetReader\ProjectNodeReader">
<UniqueIdentifier>{a6638f35-5c81-4835-9897-0f9efb0be02b}</UniqueIdentifier> <UniqueIdentifier>{a6638f35-5c81-4835-9897-0f9efb0be02b}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="cocostudio\reader\WidgetReader\ArmatureNode">
<UniqueIdentifier>{2f0e4d96-518f-4067-8c50-a55f27c96721}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\..\..\cocos2d.def" /> <None Include="$(MSBuildThisFileDirectory)..\..\..\cocos2d.def" />

4
cocos/editor-support/cocostudio/Android.mk
View File

@ -68,8 +68,8 @@ ActionTimeline/CCTimeLine.cpp \
ActionTimeline/CCActionTimeline.cpp \ ActionTimeline/CCActionTimeline.cpp \
ActionTimeline/CSLoader.cpp \ ActionTimeline/CSLoader.cpp \
FlatBuffersSerialize.cpp \ FlatBuffersSerialize.cpp \
WidgetCallBackHandlerProtocol.cpp WidgetCallBackHandlerProtocol.cpp \
WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..

1
cocos/editor-support/cocostudio/CMakeLists.txt
View File

@ -69,6 +69,7 @@ set(COCOS_CS_SRC
editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp
editor-support/cocostudio/ActionTimeline/CSLoader.cpp editor-support/cocostudio/ActionTimeline/CSLoader.cpp
editor-support/cocostudio/FlatBuffersSerialize.cpp editor-support/cocostudio/FlatBuffersSerialize.cpp
editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp
) )
include_directories( editor-support ) include_directories( editor-support )

0
cocos/editor-support/cocostudio/WidgetReader/ArmatureNode/ArmatureNodeReader.cpp → cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp
View File

0
cocos/editor-support/cocostudio/WidgetReader/ArmatureNode/ArmatureNodeReader.h → cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h
View File

0
cocos/editor-support/cocostudio/WidgetReader/ArmatureNode/CSArmatureNode_generated.h → cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/CSArmatureNode_generated.h
View File