From f5f6f1538b6cb12d1cb7fa9c47e475845132d1a7 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Wed, 26 Jul 2023 22:32:21 +0800 Subject: [PATCH] updated sub-modules. --- .gitmodules | 3 +++ CM2D | 2 +- CMCore | 2 +- CMGUI | 1 + CMPlatform | 2 +- CMSceneGraph | 2 +- CMUtil | 2 +- CMakeLists.txt | 1 + Examples | 2 +- MeshConv | 2 +- TexConv | 2 +- TextEncodeConvert | 2 +- 12 files changed, 14 insertions(+), 9 deletions(-) create mode 160000 CMGUI diff --git a/.gitmodules b/.gitmodules index 6bd3fed..5fb9d80 100644 --- a/.gitmodules +++ b/.gitmodules @@ -43,3 +43,6 @@ [submodule "PaintShader"] path = PaintShader url = https://github.com/hyzboy/PaintShader.git +[submodule "CMGUI"] + path = CMGUI + url = http://www.hyzgame.com:3000/hyzboy/CMGUI.git diff --git a/CM2D b/CM2D index 0fd9552..1c22233 160000 --- a/CM2D +++ b/CM2D @@ -1 +1 @@ -Subproject commit 0fd9552b4ed7daf64d06437e5b7e643c29bcf8a9 +Subproject commit 1c2223310197efabf5901c7e0dc00f7c3aafe2e4 diff --git a/CMCore b/CMCore index b0d404b..c39eea2 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit b0d404bb11e83511b553c14960f5b67066d365bb +Subproject commit c39eea296f1a2d1b4beaa69e14fa988968f8755f diff --git a/CMGUI b/CMGUI new file mode 160000 index 0000000..c6e05ee --- /dev/null +++ b/CMGUI @@ -0,0 +1 @@ +Subproject commit c6e05eeba441cd44bb8715f06474b84e6518f83f diff --git a/CMPlatform b/CMPlatform index 19b2bf7..c8620f8 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit 19b2bf713aee71de42b75a1e1b8276a0e3a90430 +Subproject commit c8620f8d6a877aefbe67795838a796614c9508b5 diff --git a/CMSceneGraph b/CMSceneGraph index 65ef705..b4af070 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 65ef7052d162225a03e96a895586c3492ddd7447 +Subproject commit b4af070eefa1eec9f7c860a10d8da7b664b6a760 diff --git a/CMUtil b/CMUtil index 3103321..7ed3987 160000 --- a/CMUtil +++ b/CMUtil @@ -1 +1 @@ -Subproject commit 31033215854f68b2c3b690cc215423dd6b44856c +Subproject commit 7ed3987cdae2dac46e42b5d6070786a6ee05e827 diff --git a/CMakeLists.txt b/CMakeLists.txt index ff93ec5..163bed3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,7 @@ option(CM_QT_EXTRA_STYLE OFF) use_cm_module(Core) use_cm_module(Platform) use_cm_module(2D) +use_cm_module(GUI) use_cm_module(Util) #use_cm_module(AssetsManage) use_cm_module(SceneGraph) diff --git a/Examples b/Examples index d09e0e9..b37413b 160000 --- a/Examples +++ b/Examples @@ -1 +1 @@ -Subproject commit d09e0e91ff0e2ee09ea56597bbd4d64cf8823469 +Subproject commit b37413ba042a03b6674e3a9aed512c33c86ced2a diff --git a/MeshConv b/MeshConv index fcbdf19..f5460b0 160000 --- a/MeshConv +++ b/MeshConv @@ -1 +1 @@ -Subproject commit fcbdf1941c785e29f0785904d9dd0de9b07ba41b +Subproject commit f5460b07a4b09e715d52c6391c370e3052f746df diff --git a/TexConv b/TexConv index 6b08c54..02be1e4 160000 --- a/TexConv +++ b/TexConv @@ -1 +1 @@ -Subproject commit 6b08c54c54834789be249128ded1a71b243ee108 +Subproject commit 02be1e421ee7dff4bf8732ec2a64b45ddb9ca5a5 diff --git a/TextEncodeConvert b/TextEncodeConvert index cc4b41f..bbde169 160000 --- a/TextEncodeConvert +++ b/TextEncodeConvert @@ -1 +1 @@ -Subproject commit cc4b41f93f9bd97328a9468e01c42268f03982c9 +Subproject commit bbde1690c41d7970dae07534624f6279a2de4b7f