diff --git a/trinity/CMakeLists.txt b/trinity/CMakeLists.txt index 606b971e0..9d8822d1e 100644 --- a/trinity/CMakeLists.txt +++ b/trinity/CMakeLists.txt @@ -1898,6 +1898,7 @@ function(set_shared_trinity_properties target package_name) target_compile_definitions(${target} PRIVATE BLUE_USE_LOCAL_ITr2DebugRenderer2=1 + PYTHON2_SUPPORT=1 ) endif() diff --git a/trinity/Tr2RenderContext.cpp b/trinity/Tr2RenderContext.cpp index 7eb2abbf3..49eef356d 100644 --- a/trinity/Tr2RenderContext.cpp +++ b/trinity/Tr2RenderContext.cpp @@ -151,7 +151,12 @@ Tr2RenderTargetPtr Tr2RenderContextBase::GetBackBuffer() Tr2RenderContext::Tr2RenderContext() : Tr2RenderContextBase( *this ), m_parallelContextMutex( "Tr2RenderContext", "m_parallelContextMutex" ), + +#ifdef PYTHON2_SUPPORT m_parallelContextSemaphore( 0, 1024 ) +#else + m_parallelContextSemaphore( "Tr2RenderContext_m_parallelContextSemaphore", 0, 1024 ) +#endif { #if !TRINITY_PLATFORM_HAS_PRIMARY_CONTEXT m_events = this; diff --git a/vcpkg.json b/vcpkg.json index 94287c300..46ac26106 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -7,7 +7,7 @@ }, { "name": "carbon-core", - "version>=": "2.4.0" + "version>=": "3.0.0" }, { "name": "carbon-imageio", @@ -51,7 +51,7 @@ }, { "name": "carbon-blue", - "version>=": "5.1.2" + "version>=": "6.0.0" }, { "name": "carbon-math",