dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-06-07 15:44:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1253 from danilaml/patch-1

Browse Source 
Fix clang compiling
This commit is contained in:
DHrpcs3 2015-10-14 00:19:47 +03:00
commit 6d99516489
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Utilities/config_context.h
View File

@ -94,7 +94,7 @@ public:
value(convert::to<T>(new_value)); value(convert::to<T>(new_value));
} }
void value_from(const entry_base* rhs) void value_from(const entry_base* rhs) override
{ {
value(static_cast<const entry*>(rhs)->value()); value(static_cast<const entry*>(rhs)->value());
} }
@ -125,4 +125,4 @@ public:
void set_defaults(); void set_defaults();
std::string to_string() const; std::string to_string() const;
}; };

1
rpcs3/CMakeLists.txt
View File

@ -19,6 +19,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
# Warnings # Warnings
add_compile_options(-Wno-attributes -Wno-enum-compare -Wno-invalid-offsetof) add_compile_options(-Wno-attributes -Wno-enum-compare -Wno-invalid-offsetof)
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
add_compile_options(-ftemplate-depth=1024)
if(APPLE) if(APPLE)
add_compile_options(-stdlib=libc++) add_compile_options(-stdlib=libc++)
endif() endif()