archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-06 23:11:18 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

MSVC stuff

Browse source
This commit is contained in:
capitalistspz 2024-09-02 23:58:01 +01:00
parent 7a53a5cac7
commit cd3dc74548
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -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)

3
src/camera/CMakeLists.txt
View file

@ -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)

2
src/camera/CameraManager.cpp
View file

@ -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)

6
src/camera/CameraManager.h
View file

@ -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();