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

issue #1859:fix compiling error of AssetsManager.cpp

This commit is contained in:
minggo 2013-05-17 09:47:31 +08:00
parent 3b40dce1c2
commit 59a6635c7b
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
extensions/AssetsManager/AssetsManager.cpp
View File

@ -78,7 +78,7 @@ AssetsManager::AssetsManager(const char* packageUrl/* =NULL */, const char* vers
, _versionFileUrl(versionFileUrl)
, _downloadedVersion("")
, _curl(NULL)
, _tid(0)
, _tid(NULL)
, _connectionTimeout(0)
, _delegate(NULL)
{
@ -186,7 +186,11 @@ void* assetsManagerDownloadAndUncompress(void *data)
self->_schedule->sendMessage(msg2);
} while (0);
self->_tid = 0;
if (self->_tid)
{
delete self->_tid;
self->_tid = NULL;
}
return NULL;
}
@ -211,7 +215,8 @@ void AssetsManager::update()
// Is package already downloaded?
_downloadedVersion = CCUserDefault::sharedUserDefault()->getStringForKey(KEY_OF_DOWNLOADED_VERSION);
pthread_create(&_tid, NULL, assetsManagerDownloadAndUncompress, this);
_tid = new pthread_t();
pthread_create(&(*_tid), NULL, assetsManagerDownloadAndUncompress, this);
}
bool AssetsManager::uncompress()

2
extensions/AssetsManager/AssetsManager.h
View File

@ -187,7 +187,7 @@ private:
CURL *_curl;
Helper *_schedule;
pthread_t _tid;
pthread_t *_tid;
unsigned int _connectionTimeout;
AssetsManagerDelegateProtocol *_delegate; // weak reference

2
samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj
View File

@ -75,7 +75,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(ProjectDir)..\..\..\..\scripting\javascript\spidermonkey-win32\include;$(ProjectDir)..\..\..\..\external\chipmunk\include\chipmunk;$(ProjectDir)..\..\..\..\extensions;$(ProjectDir)..\..\..\..\scripting\javascript\bindings;$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\..\CocosDenshion\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(ProjectDir)..\..\..\..\scripting\javascript\spidermonkey-win32\include;$(ProjectDir)..\..\..\..\external\chipmunk\include\chipmunk;$(ProjectDir)..\..\..\..\extensions;$(ProjectDir)..\..\..\..\scripting\javascript\bindings;$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\pthread;$(ProjectDir)..\..\..\..\CocosDenshion\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;DEBUG;_DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>