From f016b0d8c535f84f9a7b79e9f4ae7755c3c866b3 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 19 May 2020 17:28:02 +0800 Subject: [PATCH] init --- CMAssetsManage | 2 +- CMCMakeModule | 2 +- CMCore | 2 +- src/CMakeLists.txt | 5 ++--- src/Tools/ModelConvert/AssimpLoader.h | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CMAssetsManage b/CMAssetsManage index 74e1d564..a100a10d 160000 --- a/CMAssetsManage +++ b/CMAssetsManage @@ -1 +1 @@ -Subproject commit 74e1d564be1a9c2af21b3fc2e4ca319e23b6616a +Subproject commit a100a10dc8750903e5bf3779c1f337f5a940910e diff --git a/CMCMakeModule b/CMCMakeModule index 4ac904d8..d4087fe9 160000 --- a/CMCMakeModule +++ b/CMCMakeModule @@ -1 +1 @@ -Subproject commit 4ac904d834b45e6cb3edc1767726850615ca89ee +Subproject commit d4087fe96c0acd43d376ec660bd5f1f351755448 diff --git a/CMCore b/CMCore index fb3f8b1c..34eef8fd 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit fb3f8b1c8631fbd168b1590a83f9d5431f359240 +Subproject commit 34eef8fdabd3fe392dcde0d07eab26538e096c77 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e6e5f800..92567e2a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,4 @@ - -add_subdirectory(Util) +add_subdirectory(Util) add_subdirectory(RenderDevice) add_subdirectory(SceneGraph) -add_subdirectory(Tools) +#add_subdirectory(Tools) diff --git a/src/Tools/ModelConvert/AssimpLoader.h b/src/Tools/ModelConvert/AssimpLoader.h index 52f2d890..68d4fac5 100644 --- a/src/Tools/ModelConvert/AssimpLoader.h +++ b/src/Tools/ModelConvert/AssimpLoader.h @@ -8,7 +8,7 @@ #include #include #include -#include +//#include #include #include #include