Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

update patch for issue 39 build error on archlinux (allocator static_assert error)

Browse source
This commit is contained in:
AleaJactaEst 2018-06-14 22:10:50 +02:00
parent ad0d5884ac
commit 574379cc6e
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
patch/02_archlinux_allocator_static_assert_error.patch
View file

@ -1,12 +1,15 @@
diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index 95b28bb8a..8c4871379 100644 index 95b28bb8a..92d014836 100644
--- a/code/CMakeModules/nel.cmake --- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake
@@ -874,7 +874,7 @@ MACRO(NL_SETUP_BUILD) @@ -873,8 +873,8 @@ MACRO(NL_SETUP_BUILD)
ENDIF() ENDIF()
ENDIF()
# use c++0x standard to use std::unique_ptr and std::shared_ptr
- SET(PLATFORM_CXXFLAGS "${PLATFORM_CXXFLAGS} -std=c++0x") - # use c++0x standard to use std::unique_ptr and std::shared_ptr
+ SET(PLATFORM_CXXFLAGS "${PLATFORM_CXXFLAGS} -std=gnu++14") - SET(PLATFORM_CXXFLAGS "${PLATFORM_CXXFLAGS} -std=c++0x")
+ # use gnu++14 standard to use std::unique_ptr and std::shared_ptr
ADD_PLATFORM_FLAGS("-D_REENTRANT") + SET(PLATFORM_CXXFLAGS "${PLATFORM_CXXFLAGS} -std=gnu++14")
ADD_PLATFORM_FLAGS("-D_REENTRANT")