Merge pull request #141 from brechtsanders/master

Fix version 17.1.460 for building with MinGW-w64
smasherprog · Oct 16, 2022 · 7586bd5 · 7586bd5
2 parents 97c5521 + abaab3f
commit 7586bd5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/include/internal/SCCommon.h b/include/internal/SCCommon.h
@@ -7,14 +7,14 @@
 namespace SL {
 namespace Screen_Capture {
     template <typename F, typename M, typename W> struct CaptureData {
-#if defined(_WIN32) && defined(__cplusplus) && __cplusplus >= 202002L
+#if defined(_WIN32) && defined(__cplusplus) && __cplusplus >= 202002L && !defined(__MINGW32__)
         std::atomic<std::shared_ptr<Timer> > FrameTimer;
 #else
         std::shared_ptr<Timer> FrameTimer;
 #endif
         F OnNewFrame;
         F OnFrameChanged;
-#if defined(_WIN32) && defined(__cplusplus) && __cplusplus >= 202002L
+#if defined(_WIN32) && defined(__cplusplus) && __cplusplus >= 202002L && !defined(__MINGW32__)
         std::atomic<std::shared_ptr<Timer> > MouseTimer;
 #else
         std::shared_ptr<Timer> MouseTimer;

diff --git a/include/internal/ThreadManager.h b/include/internal/ThreadManager.h
@@ -99,7 +99,7 @@ namespace Screen_Capture {
             // get a copy of the shared_ptr in a safe way
 
             frameprocessor.Resume();
-#if defined(_WIN32) && defined(__cplusplus) && __cplusplus >= 202002L
+#if defined(_WIN32) && defined(__cplusplus) && __cplusplus >= 202002L && !defined(__MINGW32__)
             auto timer = data->ScreenCaptureData.FrameTimer.load();
 #else
             auto timer = std::atomic_load(&data->ScreenCaptureData.FrameTimer);
@@ -149,7 +149,7 @@ namespace Screen_Capture {
         }
         while (!data->CommonData_.TerminateThreadsEvent) {
             // get a copy of the shared_ptr in a safe way
-#if defined(_WIN32) && defined(__cplusplus) && __cplusplus >= 202002L
+#if defined(_WIN32) && defined(__cplusplus) && __cplusplus >= 202002L && !defined(__MINGW32__)
             auto timer = data->WindowCaptureData.FrameTimer.load();
 #else
             auto timer = std::atomic_load(&data->WindowCaptureData.FrameTimer);

diff --git a/src_cpp/CMakeLists.txt b/src_cpp/CMakeLists.txt
@@ -87,7 +87,9 @@ add_library(${PROJECT_NAME}_static STATIC ${libsrc})
 	set_target_properties(${PROJECT_NAME}_shared PROPERTIES DEFINE_SYMBOL SC_LITE_DLL)
 	 if(WIN32) 
 		target_link_libraries(${PROJECT_NAME}_shared Dwmapi)
-		install (FILES $<TARGET_PDB_FILE:${PROJECT_NAME}_shared> DESTINATION bin OPTIONAL)
+		if (!MINGW)
+			install (FILES $<TARGET_PDB_FILE:${PROJECT_NAME}_shared> DESTINATION bin OPTIONAL)
+		endif()
 	elseif(APPLE)
 		find_package(Threads REQUIRED)
         find_library(corefoundation_lib CoreFoundation REQUIRED)
@@ -125,4 +127,4 @@ add_library(${PROJECT_NAME}_static STATIC ${libsrc})
 			${CMAKE_THREAD_LIBS_INIT}
 		)	 
 	endif()
-
+
diff --git a/src_cpp/ScreenCapture.cpp b/src_cpp/ScreenCapture.cpp
@@ -128,7 +128,7 @@ class ScreenCaptureManager : public IScreenCaptureManager {
 
     virtual void setFrameChangeInterval(const std::shared_ptr<Timer> &timer) override
     {
-#if defined(_WIN32) && defined(__cplusplus) && __cplusplus >= 202002L
+#if defined(_WIN32) && defined(__cplusplus) && __cplusplus >= 202002L && !defined(__MINGW32__)
             Thread_Data_->ScreenCaptureData.FrameTimer.store(timer);
             Thread_Data_->WindowCaptureData.FrameTimer.store(timer);
 #else
@@ -139,7 +139,7 @@ class ScreenCaptureManager : public IScreenCaptureManager {
 
     virtual void setMouseChangeInterval(const std::shared_ptr<Timer> &timer) override
     {
-#if defined(_WIN32) && defined(__cplusplus) && __cplusplus >= 202002L
+#if defined(_WIN32) && defined(__cplusplus) && __cplusplus >= 202002L && !defined(__MINGW32__)
             Thread_Data_->ScreenCaptureData.MouseTimer.store(timer);
             Thread_Data_->WindowCaptureData.MouseTimer.store(timer);
 #else