diff --git a/CMakeLists.txt b/CMakeLists.txt index c5bc6e7d9003fc..8800602b704056 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,8 @@ endif() find_package(CXX11 REQUIRED) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS}") -if(${CMAKE_C_COMPILER_ID} MATCHES "Clang" OR ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") +#clang-cl is considered MSVC here +if((${CMAKE_C_COMPILER_ID} MATCHES "Clang" OR ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") AND NOT MSVC) set(CMAKE_COMPILER_IS_CLANG TRUE) endif() diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index 6a8a5cbc4ac449..7100ef5ddd9f7a 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -476,7 +476,7 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent) } #define PROCESS_PRIORITY(val) \ - {"Basic.Settings.Advanced.General.ProcessPriority." ## val , val} + {"Basic.Settings.Advanced.General.ProcessPriority." val , val} static struct ProcessPriority { const char *name; diff --git a/plugins/obs-text/gdiplus/obs-text.cpp b/plugins/obs-text/gdiplus/obs-text.cpp index 031e97907cfe5b..557d62949da172 100644 --- a/plugins/obs-text/gdiplus/obs-text.cpp +++ b/plugins/obs-text/gdiplus/obs-text.cpp @@ -542,7 +542,7 @@ void TextSource::RenderText() stat = graphics_bitmap.Clear(Color(0)); warn_stat("graphics_bitmap.Clear"); - SolidBrush bk_brush = Color(full_bk_color); + SolidBrush bk_brush(full_bk_color); stat = graphics_bitmap.FillRectangle(&bk_brush, box); warn_stat("graphics_bitmap.FillRectangle"); } else {