diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d24bd81..929259fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,6 +223,7 @@ endif() add_subdirectory("dependencies/ih264d" EXCLUDE_FROM_ALL) add_subdirectory("dependencies/openpnp-capture" EXCLUDE_FROM_ALL SYSTEM) +set_property(TARGET openpnp-capture PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") find_package(ZArchive) if (NOT ZArchive_FOUND) diff --git a/src/camera/CMakeLists.txt b/src/camera/CMakeLists.txt index 3e899fec..8a8e96f3 100644 --- a/src/camera/CMakeLists.txt +++ b/src/camera/CMakeLists.txt @@ -4,5 +4,8 @@ add_library(CemuCamera Rgb2Nv12.cpp Rgb2Nv12.h ) + +set_property(TARGET CemuCamera PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + target_include_directories(CemuCamera PUBLIC "../") target_link_libraries(CemuCamera PRIVATE CemuCommon CemuUtil PUBLIC openpnp-capture) \ No newline at end of file diff --git a/src/camera/CameraManager.cpp b/src/camera/CameraManager.cpp index eb62dc59..b5c03983 100644 --- a/src/camera/CameraManager.cpp +++ b/src/camera/CameraManager.cpp @@ -21,7 +21,7 @@ CameraManager::~CameraManager() Cap_releaseContext(m_ctx); } -void CameraManager::SetDevice(uint deviceNo) +void CameraManager::SetDevice(unsigned deviceNo) { std::scoped_lock lock(m_mutex); if (m_device == deviceNo) diff --git a/src/camera/CameraManager.h b/src/camera/CameraManager.h index a7024e3d..502ff82e 100644 --- a/src/camera/CameraManager.h +++ b/src/camera/CameraManager.h @@ -8,8 +8,8 @@ class CameraManager : public Singleton CapContext m_ctx; std::optional m_device; std::optional m_stream; - std::vector m_rgbBuffer; - std::vector m_nv12Buffer; + std::vector m_rgbBuffer; + std::vector m_nv12Buffer; int m_refCount; std::thread m_captureThread; std::atomic_bool m_capturing; @@ -19,7 +19,7 @@ class CameraManager : public Singleton CameraManager(); ~CameraManager(); - void SetDevice(uint deviceNo); + void SetDevice(unsigned deviceNo); bool Open(bool weak); void Close();