mirror of
https://github.com/cemu-project/Cemu.git
synced 2025-07-06 23:11:18 +12:00
MSVC stuff
This commit is contained in:
parent
7a53a5cac7
commit
cd3dc74548
4 changed files with 8 additions and 4 deletions
|
@ -223,6 +223,7 @@ endif()
|
||||||
add_subdirectory("dependencies/ih264d" EXCLUDE_FROM_ALL)
|
add_subdirectory("dependencies/ih264d" EXCLUDE_FROM_ALL)
|
||||||
|
|
||||||
add_subdirectory("dependencies/openpnp-capture" EXCLUDE_FROM_ALL SYSTEM)
|
add_subdirectory("dependencies/openpnp-capture" EXCLUDE_FROM_ALL SYSTEM)
|
||||||
|
set_property(TARGET openpnp-capture PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
|
||||||
|
|
||||||
find_package(ZArchive)
|
find_package(ZArchive)
|
||||||
if (NOT ZArchive_FOUND)
|
if (NOT ZArchive_FOUND)
|
||||||
|
|
|
@ -4,5 +4,8 @@ add_library(CemuCamera
|
||||||
Rgb2Nv12.cpp
|
Rgb2Nv12.cpp
|
||||||
Rgb2Nv12.h
|
Rgb2Nv12.h
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set_property(TARGET CemuCamera PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
|
||||||
|
|
||||||
target_include_directories(CemuCamera PUBLIC "../")
|
target_include_directories(CemuCamera PUBLIC "../")
|
||||||
target_link_libraries(CemuCamera PRIVATE CemuCommon CemuUtil PUBLIC openpnp-capture)
|
target_link_libraries(CemuCamera PRIVATE CemuCommon CemuUtil PUBLIC openpnp-capture)
|
|
@ -21,7 +21,7 @@ CameraManager::~CameraManager()
|
||||||
Cap_releaseContext(m_ctx);
|
Cap_releaseContext(m_ctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CameraManager::SetDevice(uint deviceNo)
|
void CameraManager::SetDevice(unsigned deviceNo)
|
||||||
{
|
{
|
||||||
std::scoped_lock lock(m_mutex);
|
std::scoped_lock lock(m_mutex);
|
||||||
if (m_device == deviceNo)
|
if (m_device == deviceNo)
|
||||||
|
|
|
@ -8,8 +8,8 @@ class CameraManager : public Singleton<CameraManager>
|
||||||
CapContext m_ctx;
|
CapContext m_ctx;
|
||||||
std::optional<CapDeviceID> m_device;
|
std::optional<CapDeviceID> m_device;
|
||||||
std::optional<CapStream> m_stream;
|
std::optional<CapStream> m_stream;
|
||||||
std::vector<uint8_t> m_rgbBuffer;
|
std::vector<uint8> m_rgbBuffer;
|
||||||
std::vector<uint8_t> m_nv12Buffer;
|
std::vector<uint8> m_nv12Buffer;
|
||||||
int m_refCount;
|
int m_refCount;
|
||||||
std::thread m_captureThread;
|
std::thread m_captureThread;
|
||||||
std::atomic_bool m_capturing;
|
std::atomic_bool m_capturing;
|
||||||
|
@ -19,7 +19,7 @@ class CameraManager : public Singleton<CameraManager>
|
||||||
CameraManager();
|
CameraManager();
|
||||||
~CameraManager();
|
~CameraManager();
|
||||||
|
|
||||||
void SetDevice(uint deviceNo);
|
void SetDevice(unsigned deviceNo);
|
||||||
|
|
||||||
bool Open(bool weak);
|
bool Open(bool weak);
|
||||||
void Close();
|
void Close();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue