File tree Expand file tree Collapse file tree 3 files changed +6
-1
lines changed
Expand file tree Collapse file tree 3 files changed +6
-1
lines changed Original file line number Diff line number Diff line change 3838[submodule "3rdParty/sol2 "]
3939 path = 3rdParty/sol2
4040 url = https://github.com/ThePhD/sol2.git
41+ [submodule "3rdParty/glm "]
42+ path = 3rdParty/glm
43+ url = https://github.com/g-truc/glm.git
Original file line number Diff line number Diff line change @@ -99,6 +99,7 @@ include_directories(
9999 ${CMAKE_CURRENT_SOURCE_DIR} /3rdParty/nativefiledialog/src/include
100100 ${CMAKE_CURRENT_SOURCE_DIR} /3rdParty/Detours/src
101101 ${CMAKE_CURRENT_SOURCE_DIR} /3rdParty/sol2/single
102+ ${CMAKE_CURRENT_SOURCE_DIR} /3rdParty/glm
102103 ${CMAKE_CURRENT_SOURCE_DIR}
103104 ${GTK3_INCLUDE_DIRS}
104105)
@@ -493,7 +494,7 @@ INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/data/GameDefinitions/Developer mode.j
493494if (MSVC )
494495 # Build cpp files on all cores
495496
496- SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /wd4371 /wd4503 /wd4351 /wd4514 /wd4350 /wd4710 /wd4571 /wd4820 /wd4668 /wd4626 /wd4625 /wd4365 /wd4640 /wd4628 /wd4061 /wd4826 /wd4127 /wd4711 /wd4738 /wd4255 /WX" )
497+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /wd4201 /wd4324 /wd4464 / wd4371 /wd4503 /wd4351 /wd4514 /wd4350 /wd4710 /wd4571 /wd4820 /wd4668 /wd4626 /wd4625 /wd4365 /wd4640 /wd4628 /wd4061 /wd4826 /wd4127 /wd4711 /wd4738 /wd4255 /WX" )
497498 # Warnings added in VS2013 and later
498499 if (MSVC_VERSION GREATER 1800)
499500 SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd5026 /wd5027 /wd4868" )
You can’t perform that action at this time.
0 commit comments