From 80cae7618c10c303513c5b24c20d78490d0264be Mon Sep 17 00:00:00 2001 From: hyzboy Date: Fri, 24 Sep 2021 01:05:20 +0800 Subject: [PATCH] deleted MathGeoLib,added glm --- .gitmodules | 6 +++--- 3rdpty/MathGeoLib | 1 - 3rdpty/glm | 1 + 3rdpty/jsoncpp | 2 +- CMCMakeModule | 2 +- CMakeLists.txt | 3 ++- 6 files changed, 8 insertions(+), 7 deletions(-) delete mode 160000 3rdpty/MathGeoLib create mode 160000 3rdpty/glm diff --git a/.gitmodules b/.gitmodules index 74c0c79f..90642bbc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "3rdpty/MathGeoLib"] - path = 3rdpty/MathGeoLib - url = https://github.com/juj/MathGeoLib.git [submodule "3rdpty/jsoncpp"] path = 3rdpty/jsoncpp url = https://github.com/open-source-parsers/jsoncpp @@ -25,3 +22,6 @@ [submodule "CMUtil"] path = CMUtil url = https://github.com/hyzboy/CMUtil.git +[submodule "3rdpty/glm"] + path = 3rdpty/glm + url = https://github.com/g-truc/glm.git diff --git a/3rdpty/MathGeoLib b/3rdpty/MathGeoLib deleted file mode 160000 index 97a78cdd..00000000 --- a/3rdpty/MathGeoLib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 97a78cdd429f33a7c074fd0d7649012eec20d43a diff --git a/3rdpty/glm b/3rdpty/glm new file mode 160000 index 00000000..6ad79aae --- /dev/null +++ b/3rdpty/glm @@ -0,0 +1 @@ +Subproject commit 6ad79aae3eb5bf809c30bf1168171e9e55857e45 diff --git a/3rdpty/jsoncpp b/3rdpty/jsoncpp index c39fbdac..94a6220f 160000 --- a/3rdpty/jsoncpp +++ b/3rdpty/jsoncpp @@ -1 +1 @@ -Subproject commit c39fbdac0f0f6638d5cfca43988750a1aac512db +Subproject commit 94a6220f7c738d6711d325fd29bb8a60b97fd77e diff --git a/CMCMakeModule b/CMCMakeModule index b61ed5cb..dd86bf63 160000 --- a/CMCMakeModule +++ b/CMCMakeModule @@ -1 +1 @@ -Subproject commit b61ed5cbfad8b76339ef1b2564ca03ffe34de7cc +Subproject commit dd86bf63150b0f50dcc4a53b79df6cba63b04851 diff --git a/CMakeLists.txt b/CMakeLists.txt index 54a6d998..9528eb67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,8 @@ set(ULRE_3RDPTY_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/3rdpty) include(vulkan) 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) use_cm_module(Core)