diff --git a/.gitmodules b/.gitmodules index 6832e30..17c52a3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,6 +37,3 @@ [submodule "TextEncodeConvert"] path = TextEncodeConvert url = https://github.com/hyzboy/TextEncodeConvert.git -[submodule "glm"] - path = glm - url = https://github.com/g-truc/glm.git diff --git a/CMCMakeModule b/CMCMakeModule index e78ebeb..78046ef 160000 --- a/CMCMakeModule +++ b/CMCMakeModule @@ -1 +1 @@ -Subproject commit e78ebebee1c373346ab6da0ee1a174090825f29a +Subproject commit 78046ef7e5a33ace87bb7a858dccab4fe737d24a diff --git a/CMCore b/CMCore index 021df22..1cefb33 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 021df224d02430159428c51c01883ce23ab4f03e +Subproject commit 1cefb338da8887ceaf800aecc9e1bc24dee63e8c diff --git a/CMSceneGraph b/CMSceneGraph index b5b673f..7c8a588 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit b5b673f8a65a0c1a8b4972f81e45122bad5155a5 +Subproject commit 7c8a5888a72d091e6bf6192226dec16d84d50245 diff --git a/CMUtil b/CMUtil index be9122d..2c5a81b 160000 --- a/CMUtil +++ b/CMUtil @@ -1 +1 @@ -Subproject commit be9122db80512d3c046fe68b3b9948dd2078dec7 +Subproject commit 2c5a81b32b7ee1a5dd40010c8c62f6cff4a87945 diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f0496b..c3fdad8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,9 +9,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule) include(vulkan) include(math) -use_glm(${CMAKE_CURRENT_SOURCE_DIR}/glm) - include(use_cm_module) + use_cm_module(Core) use_cm_module(Platform) #use_cm_module(2D) @@ -30,12 +29,9 @@ if(CM_BUILD_TOOLS) include(QtCommon) ENDIF() -if(WIN32) - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/TexConv/DevIL Windows SDK/include") - link_directories("${CMAKE_CURRENT_SOURCE_DIR}/TexConv/DevIL Windows SDK/lib/x64/unicode/Release") - - set(CM_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule/cm_windows.manifest) -endif(WIN32) + if(WIN32) + set(CM_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule/cm_windows.manifest) + endif(WIN32) set(TEX_CONV_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/TexConv) diff --git a/MeshConv b/MeshConv index 2f13c57..fcbdf19 160000 --- a/MeshConv +++ b/MeshConv @@ -1 +1 @@ -Subproject commit 2f13c57348113928382521b50e7f100b8cdf372d +Subproject commit fcbdf1941c785e29f0785904d9dd0de9b07ba41b diff --git a/ShaderMaker b/ShaderMaker index b82dade..f4d0557 160000 --- a/ShaderMaker +++ b/ShaderMaker @@ -1 +1 @@ -Subproject commit b82dade250fbc65217775793b5cab8a1cc302c77 +Subproject commit f4d0557184562a8167d9f92d2e0bcfb084522dec diff --git a/TexConv b/TexConv index 1a9631d..afe3dee 160000 --- a/TexConv +++ b/TexConv @@ -1 +1 @@ -Subproject commit 1a9631dae9b94a51516cfb669cb10dd44a114989 +Subproject commit afe3dee96f5a2a43b9bb298e55851b2c784f95d1 diff --git a/glm b/glm deleted file mode 160000 index 6ad79aa..0000000 --- a/glm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6ad79aae3eb5bf809c30bf1168171e9e55857e45