Skip to content
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

MacOS Monterey compilation issues #80

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

MacOS Monterey compilation issues #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
43e1141
Merge remote-tracking branch 'origin/master'
Jorgemagic Dec 20, 2018
4af4d94
Merge remote-tracking branch 'origin/master'
Jorgemagic Aug 27, 2019
77b5802
Merge remote-tracking branch 'origin/master'
Jorgemagic Sep 16, 2019
1b30a7f
Merge remote-tracking branch 'origin/master'
Jorgemagic Jan 12, 2021
357bec8
Merge remote-tracking branch 'origin/master'
Jorgemagic Dec 13, 2022
f1e346e
- MacOS compilation issues
Jorgemagic Jan 13, 2023
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 @@ -11,6 +11,7 @@ endif()

set(PROJECT_NAME ShaderConductor)
project(${PROJECT_NAME})

if(SC_WITH_CSHARP)
project(${PROJECT_NAME} LANGUAGES CSharp)
set(CMAKE_CSharp_FLAGS "/langversion:7")
Expand All @@ -32,7 +33,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SC_BUILD_DIR}/Lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SC_BUILD_DIR}/Lib)

if((CMAKE_C_COMPILER_ID MATCHES GNU) OR (CMAKE_C_COMPILER_ID MATCHES Clang))
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
endif()
if (CMAKE_C_COMPILER_ID MATCHES Clang)
foreach(flagVar
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/ShaderConductor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ namespace
private:
std::function<Blob(const char* includeName)> m_loadCallback;

std::atomic<ULONG> m_ref = 0;
std::atomic<ULONG> m_ref = {0};
};

Blob DefaultLoadCallback(const char* includeName)
Expand Down