mirror of
https://github.com/libAthena/athena.git
synced 2025-05-13 19:01:23 +00:00
Merge branch 'master' of https://github.com/libAthena/Athena
This commit is contained in:
commit
f46edcd4b8
@ -21,7 +21,7 @@ add_subdirectory(extern)
|
|||||||
|
|
||||||
include_directories(include ${LZO_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
|
include_directories(include ${LZO_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
|
||||||
if (NOT MSVC)
|
if (NOT MSVC)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user