Skip to content

Commit 1392ef2

Browse files
committed
add glm sub module
1 parent 78a2402 commit 1392ef2

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@
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

3rdParty/glm

Submodule glm added at 773389c

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff 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
493494
if (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")

0 commit comments

Comments
 (0)