Skip to content

[WIP] Support for clang-cl #1549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
computerquip wants to merge 3 commits into from
Closed

[WIP] Support for clang-cl #1549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ba8696
cmake: Take into account clang may be an msvc compiler
computerquip-streamlabs Nov 20, 2018
cd6bb89
UI: Fix non-standard use of token concatenation
computerquip-streamlabs Nov 20, 2018
8af2c7e
obs-text: Fix non-standard initialization of SolidBrush
computerquip-streamlabs Nov 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion UI/window-basic-settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion plugins/obs-text/gdiplus/obs-text.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down