diff --git a/native/cocos/2d/libcocos2d.vcxproj b/native/cocos/2d/libcocos2d.vcxproj index 156e7c2f61..9bfda52fc5 100644 --- a/native/cocos/2d/libcocos2d.vcxproj +++ b/native/cocos/2d/libcocos2d.vcxproj @@ -233,6 +233,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32\libs\*.*" "$(OutDir)" + @@ -481,6 +482,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32\libs\*.*" "$(OutDir)" + diff --git a/native/cocos/2d/libcocos2d.vcxproj.filters b/native/cocos/2d/libcocos2d.vcxproj.filters index afad616311..80d22e9074 100644 --- a/native/cocos/2d/libcocos2d.vcxproj.filters +++ b/native/cocos/2d/libcocos2d.vcxproj.filters @@ -689,9 +689,6 @@ base - - ui\UIWidgets\ScrollWidget - creator @@ -786,6 +783,9 @@ network\Source Files + + base + @@ -1480,8 +1480,6 @@ - - creator @@ -1545,6 +1543,9 @@ ui\UIWidgets\EditBox + + base + diff --git a/native/cocos/base/CCThreadPool.cpp b/native/cocos/base/CCThreadPool.cpp index 4c7974cd60..d51ed50c82 100644 --- a/native/cocos/base/CCThreadPool.cpp +++ b/native/cocos/base/CCThreadPool.cpp @@ -26,7 +26,6 @@ ****************************************************************************/ #include "base/CCThreadPool.h" -#include #ifdef __ANDROID__ @@ -165,7 +164,7 @@ bool ThreadPool::tryShrinkPool() for (int i = 0; i < _maxThreadNum; ++i) { - if (threadIDsToJoin.size() >= maxThreadNumToJoin) + if ((int)threadIDsToJoin.size() >= maxThreadNumToJoin) { break; } @@ -330,7 +329,7 @@ void ThreadPool::stopTasksByType(TaskType type) void ThreadPool::joinThread(int tid) { - if (tid < 0 || tid >= _threads.size()) + if (tid < 0 || tid >= (int)_threads.size()) { LOGD("Invalid thread id %d\n", tid); return; diff --git a/native/cocos/base/CCThreadPool.h b/native/cocos/base/CCThreadPool.h index 5498bbfd9f..7f19e7b1a3 100644 --- a/native/cocos/base/CCThreadPool.h +++ b/native/cocos/base/CCThreadPool.h @@ -26,7 +26,7 @@ ****************************************************************************/ #pragma once -//#include "platform/CCPlatformMacros.h" +#include "platform/CCStdC.h" #include #include @@ -44,7 +44,7 @@ namespace cocos2d { namespace experimental { * @{ */ -class ThreadPool +class CC_DLL ThreadPool { public: