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

Merge pull request #181 from songchengjiang/sync_load 

fix errors on Windows
This commit is contained in:
XiaoYang 2014-12-19 13:33:20 +07:00
parent eb2e27ef27 f5f95c5693
commit 6be4538f3d
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/libcocos2d.vcxproj
View File

@ -245,6 +245,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClCompile Include="..\audio\win32\SimpleAudioEngine.cpp" /> <ClCompile Include="..\audio\win32\SimpleAudioEngine.cpp" />
<ClCompile Include="..\base\atitc.cpp" /> <ClCompile Include="..\base\atitc.cpp" />
<ClCompile Include="..\base\base64.cpp" /> <ClCompile Include="..\base\base64.cpp" />
<ClCompile Include="..\base\CCAsyncTaskPool.cpp" />
<ClCompile Include="..\base\CCAutoreleasePool.cpp" /> <ClCompile Include="..\base\CCAutoreleasePool.cpp" />
<ClCompile Include="..\base\ccCArray.cpp" /> <ClCompile Include="..\base\ccCArray.cpp" />
<ClCompile Include="..\base\CCConfiguration.cpp" /> <ClCompile Include="..\base\CCConfiguration.cpp" />
@ -612,6 +613,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClInclude Include="..\audio\win32\MciPlayer.h" /> <ClInclude Include="..\audio\win32\MciPlayer.h" />
<ClInclude Include="..\base\atitc.h" /> <ClInclude Include="..\base\atitc.h" />
<ClInclude Include="..\base\base64.h" /> <ClInclude Include="..\base\base64.h" />
<ClInclude Include="..\base\CCAsyncTaskPool.h" />
<ClInclude Include="..\base\CCAutoreleasePool.h" /> <ClInclude Include="..\base\CCAutoreleasePool.h" />
<ClInclude Include="..\base\ccCArray.h" /> <ClInclude Include="..\base\ccCArray.h" />
<ClInclude Include="..\base\ccConfig.h" /> <ClInclude Include="..\base\ccConfig.h" />

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

@ -1289,6 +1289,9 @@
<ClCompile Include="..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.cpp"> <ClCompile Include="..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.cpp">
<Filter>cocostudio\json</Filter> <Filter>cocostudio\json</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\base\CCAsyncTaskPool.cpp">
<Filter>base</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\physics\CCPhysicsBody.h"> <ClInclude Include="..\physics\CCPhysicsBody.h">
@ -2505,6 +2508,9 @@
<ClInclude Include="..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.h"> <ClInclude Include="..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.h">
<Filter>cocostudio\json</Filter> <Filter>cocostudio\json</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\base\CCAsyncTaskPool.h">
<Filter>base</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\math\Mat4.inl"> <None Include="..\math\Mat4.inl">

2
cocos/3d/CCSprite3D.h
View File

@ -200,7 +200,7 @@ protected:
}; };
/////////////////////////////////////////////////////// ///////////////////////////////////////////////////////
class Sprite3DCache class CC_DLL Sprite3DCache
{ {
public: public:
struct Sprite3DData struct Sprite3DData

2
cocos/base/CCAsyncTaskPool.h
View File

@ -41,7 +41,7 @@ THE SOFTWARE.
NS_CC_BEGIN NS_CC_BEGIN
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
class AsyncTaskPool class CC_DLL AsyncTaskPool
{ {
public: public:
typedef std::function<void(void*)> TaskCallBack; typedef std::function<void(void*)> TaskCallBack;