From d8580d59d2e79e9253b7a36b8ca77b0029933706 Mon Sep 17 00:00:00 2001 From: exstrim401 Date: Sun, 20 Nov 2022 19:32:30 +0200 Subject: [PATCH] Fix CreateThreadPool --- engine/host_saverestore.cpp | 2 +- engine/wscript | 2 +- filesystem/filesystem_async.cpp | 2 +- game/client/particlemgr.cpp | 2 +- materialsystem/cmaterialsystem.cpp | 2 +- public/vstdlib/jobthread.h | 2 +- replay/shared_replaycontext.cpp | 2 +- vstdlib/jobthread.cpp | 2 +- vstdlib/wscript | 5 ++++- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/engine/host_saverestore.cpp b/engine/host_saverestore.cpp index 881044f4..6e1afa9f 100644 --- a/engine/host_saverestore.cpp +++ b/engine/host_saverestore.cpp @@ -3286,7 +3286,7 @@ void CSaveRestore::Init( void ) threadPoolStartParams.bUseAffinityTable = true; } - g_pSaveThread = CreateThreadPool1(); + g_pSaveThread = CreateThreadPool(); g_pSaveThread->Start( threadPoolStartParams, "SaveJob" ); } diff --git a/engine/wscript b/engine/wscript index ddeb8276..1c716860 100755 --- a/engine/wscript +++ b/engine/wscript @@ -364,7 +364,7 @@ def build(bld): elif bld.env.DEST_OS == 'win32': libs += ['USER32', 'WINMM', 'WININET', 'DSOUND', 'DXGUID', 'GDI32', 'bzip2'] elif bld.env.DEST_OS == 'darwin': - libs += ['COREAUDIO', 'AUDIOTOOLBOX', 'SYSTEMCONFIGURATION'] + libs += ['APPKIT', 'COREAUDIO', 'AUDIOTOOLBOX', 'SYSTEMCONFIGURATION'] install_path = bld.env.LIBDIR diff --git a/filesystem/filesystem_async.cpp b/filesystem/filesystem_async.cpp index 2b164ac0..adce661c 100644 --- a/filesystem/filesystem_async.cpp +++ b/filesystem/filesystem_async.cpp @@ -663,7 +663,7 @@ void CBaseFileSystem::InitAsync() if ( VCRGetMode() == VCR_Disabled ) { // create the i/o thread pool - m_pThreadPool = CreateThreadPool1(); + m_pThreadPool = CreateThreadPool(); ThreadPoolStartParams_t params; params.iThreadPriority = 0; diff --git a/game/client/particlemgr.cpp b/game/client/particlemgr.cpp index 8b203e4c..246a8a78 100644 --- a/game/client/particlemgr.cpp +++ b/game/client/particlemgr.cpp @@ -1087,7 +1087,7 @@ bool CParticleMgr::Init(unsigned long count, IMaterialSystem *pMaterials) if ( IsX360() ) { //m_pThreadPool[0] = CreateThreadPool(); - m_pThreadPool[1] = CreateThreadPool1(); + m_pThreadPool[1] = CreateThreadPool(); ThreadPoolStartParams_t startParams; startParams.nThreads = 3; diff --git a/materialsystem/cmaterialsystem.cpp b/materialsystem/cmaterialsystem.cpp index bab51f3b..a3c1c233 100644 --- a/materialsystem/cmaterialsystem.cpp +++ b/materialsystem/cmaterialsystem.cpp @@ -3567,7 +3567,7 @@ IThreadPool *CMaterialSystem::CreateMatQueueThreadPool() // that only the threadpool threads should execute these jobs. startParams.bExecOnThreadPoolThreadsOnly = true; - m_pMatQueueThreadPool = CreateThreadPool1(); + m_pMatQueueThreadPool = CreateThreadPool(); m_pMatQueueThreadPool->Start( startParams, "MatQueue" ); } diff --git a/public/vstdlib/jobthread.h b/public/vstdlib/jobthread.h index bfc06e6f..05798a2c 100644 --- a/public/vstdlib/jobthread.h +++ b/public/vstdlib/jobthread.h @@ -419,7 +419,7 @@ public: //----------------------------------------------------------------------------- -JOB_INTERFACE IThreadPool *CreateThreadPool1(); +JOB_INTERFACE IThreadPool *CreateThreadPool(); JOB_INTERFACE void DestroyThreadPool( IThreadPool *pPool ); //------------------------------------- diff --git a/replay/shared_replaycontext.cpp b/replay/shared_replaycontext.cpp index 20551c1d..3199c3d9 100644 --- a/replay/shared_replaycontext.cpp +++ b/replay/shared_replaycontext.cpp @@ -75,7 +75,7 @@ bool CSharedReplayContext::InitThreadPool() { // Create thread pool Log( "Replay: Creating thread pool..." ); - IThreadPool *pThreadPool = CreateThreadPool1(); + IThreadPool *pThreadPool = CreateThreadPool(); if ( !pThreadPool ) { Log( "failed!\n" ); diff --git a/vstdlib/jobthread.cpp b/vstdlib/jobthread.cpp index add54c5e..922b770f 100644 --- a/vstdlib/jobthread.cpp +++ b/vstdlib/jobthread.cpp @@ -285,7 +285,7 @@ private: //----------------------------------------------------------------------------- -JOB_INTERFACE IThreadPool *CreateThreadPool1() +JOB_INTERFACE IThreadPool *CreateThreadPool() { return new CThreadPool; } diff --git a/vstdlib/wscript b/vstdlib/wscript index ea3322a4..ebb1290e 100755 --- a/vstdlib/wscript +++ b/vstdlib/wscript @@ -48,11 +48,13 @@ def build(bld): defines = [] libs = ['tier0','tier1'] + linkflags = [] if bld.env.DEST_OS == 'android': libs += ['ANDROID_SUPPORT'] elif bld.env.DEST_OS == 'darwin': - libs += ['ICONV', 'COREFOUNDATION', 'CORESERVICES'] + libs += ['ICONV', 'COREFOUNDATION'] + linkflags += ['-framework', 'CoreServices'] install_path = bld.env.LIBDIR @@ -64,6 +66,7 @@ def build(bld): includes = includes, defines = defines, use = libs, + linkflags = linkflags, install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count()