hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deleted MathGeoLib,added glm

Browse Source
This commit is contained in:
hyzboy 2021-09-24 01:05:20 +08:00
parent 099fccaebf
commit 80cae7618c
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -1,6 +1,3 @@
[submodule "3rdpty/MathGeoLib"]
path = 3rdpty/MathGeoLib
url = https://github.com/juj/MathGeoLib.git
[submodule "3rdpty/jsoncpp"] [submodule "3rdpty/jsoncpp"]
path = 3rdpty/jsoncpp path = 3rdpty/jsoncpp
url = https://github.com/open-source-parsers/jsoncpp url = https://github.com/open-source-parsers/jsoncpp
@ -25,3 +22,6 @@
[submodule "CMUtil"] [submodule "CMUtil"]
path = CMUtil path = CMUtil
url = https://github.com/hyzboy/CMUtil.git url = https://github.com/hyzboy/CMUtil.git
[submodule "3rdpty/glm"]
path = 3rdpty/glm
url = https://github.com/g-truc/glm.git

1
3rdpty/MathGeoLib

@ -1 +0,0 @@
Subproject commit 97a78cdd429f33a7c074fd0d7649012eec20d43a

1
3rdpty/glm Submodule

@ -0,0 +1 @@
Subproject commit 6ad79aae3eb5bf809c30bf1168171e9e55857e45

2
3rdpty/jsoncpp

@ -1 +1 @@
Subproject commit c39fbdac0f0f6638d5cfca43988750a1aac512db Subproject commit 94a6220f7c738d6711d325fd29bb8a60b97fd77e

2
CMCMakeModule

@ -1 +1 @@
Subproject commit b61ed5cbfad8b76339ef1b2564ca03ffe34de7cc Subproject commit dd86bf63150b0f50dcc4a53b79df6cba63b04851

3
CMakeLists.txt
View File

@ -11,7 +11,8 @@ set(ULRE_3RDPTY_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/3rdpty)
include(vulkan) include(vulkan)
include(math) include(math)
use_mgl(${ULRE_3RDPTY_ROOT_PATH}/MathGeoLib) #use_mgl(${ULRE_3RDPTY_ROOT_PATH}/MathGeoLib)
use_glm(${ULRE_3RDPTY_ROOT_PATH}/glm)
include(use_cm_module) include(use_cm_module)
use_cm_module(Core) use_cm_module(Core)