From d84b37e444452accb30436c999e29765924839d9 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Mon, 13 Apr 2020 21:21:22 +0800 Subject: [PATCH] update CMUtil,ShaderMaker --- CMUtil | 2 +- CMakeLists.txt | 2 ++ ShaderMaker | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMUtil b/CMUtil index ef72a3f..bf98660 160000 --- a/CMUtil +++ b/CMUtil @@ -1 +1 @@ -Subproject commit ef72a3ff8d1e5194643b892be08806fd3d7cfcfc +Subproject commit bf9866041fb7944ed52f4d09936c85901de6e21f diff --git a/CMakeLists.txt b/CMakeLists.txt index 1419888..cea38a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,5 +18,7 @@ use_cm_module(2D) use_cm_module(Util) use_cm_module(AssetsManage) +CMUtilSetup(${CMAKE_CURRENT_SOURCE_DIR}/CMUtil) + add_subdirectory(TexConv) add_subdirectory(ShaderMaker) diff --git a/ShaderMaker b/ShaderMaker index 15d9bee..93f513d 160000 --- a/ShaderMaker +++ b/ShaderMaker @@ -1 +1 @@ -Subproject commit 15d9bee2ce922342e346dbb947bd9c0a5b507d55 +Subproject commit 93f513da46d020958c992754228eefd2db8d8675