Merge branch 'master' of https://github.com/hyzboy/CMProject

2020-06-15 09:57:43 +08:00
parent b48bd65207 108f0d8d6b
commit e23085f89c
6 changed files with 8 additions and 3 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,3 +31,6 @@
 [submodule "CMSceneGraph"]
 	path = CMSceneGraph
 	url = https://github.com/hyzboy/CMSceneGraph.git
+[submodule "MeshConv"]
+	path = MeshConv
+	url = https://github.com/hyzboy/MeshConv.git
--- a/2
+++ b/2
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ if(CM_BUILD_TOOLS)

    add_subdirectory(TexConv)
    add_subdirectory(ShaderMaker)
+    add_subdirectory(MeshConv)
 endif(CM_BUILD_TOOLS)

 OPTION(CM_BUILD_EXAMPLES    OFF)
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/2
+++ b/2