From 6508b18d9cc9e8cbceae4477d8d6f3f28166d772 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Tue, 18 Nov 2025 19:17:18 +0900 Subject: [PATCH] update --- .gitmodules | 3 +++ CMakeLists.txt | 13 +++++++++++++ include/config.h.in | 8 ++++++++ mdebase | 2 +- mdecmake | 1 + mdeutils | 2 +- 6 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 include/config.h.in create mode 160000 mdecmake diff --git a/.gitmodules b/.gitmodules index a6cecb0..e948a24 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,3 +14,6 @@ path = mdeutils url = ../mdeutils update = rebase +[submodule "mdecmake"] + path = mdecmake + url = ../mdecmake diff --git a/CMakeLists.txt b/CMakeLists.txt index a0a28c3..02b66c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,18 @@ project( mde ) +file( + GLOB + CMAKE_SRC + mdecmake/*.cmake +) +foreach(SRC IN LISTS CMAKE_SRC) + include(${SRC}) +endforeach() + +configure_file(include/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + set(CLASSIC_THEME 1) set(USE_FREETYPE2 0) add_subdirectory(external/milsko) @@ -11,3 +23,4 @@ include_directories(external) add_subdirectory(mdelibs) add_subdirectory(mdebase) +add_subdirectory(mdeutils) diff --git a/include/config.h.in b/include/config.h.in new file mode 100644 index 0000000..f041cba --- /dev/null +++ b/include/config.h.in @@ -0,0 +1,8 @@ +#ifndef __CONFIG_H__ +#define __CONFIG_H__ + +#define PREFIX "@CMAKE_INSTALL_PREFIX@" +#define CONFDIR "@CMAKE_INSTALL_FULL_SYSCONFDIR@" +#define DATADIR "@CMAKE_INSTALL_FULL_DATAROOTDIR@" + +#endif diff --git a/mdebase b/mdebase index 8121d82..879f365 160000 --- a/mdebase +++ b/mdebase @@ -1 +1 @@ -Subproject commit 8121d8296fd179a509c08c1b9f75e6742ae508d4 +Subproject commit 879f365905fc2f1fc277e9d82710b585cdd71c17 diff --git a/mdecmake b/mdecmake new file mode 160000 index 0000000..89165c9 --- /dev/null +++ b/mdecmake @@ -0,0 +1 @@ +Subproject commit 89165c9baacd04ab539d150c500d14ccd4ab5771 diff --git a/mdeutils b/mdeutils index 8977d30..c95f7b6 160000 --- a/mdeutils +++ b/mdeutils @@ -1 +1 @@ -Subproject commit 8977d30b9a5fb7413efb203093fb392600f6bf7e +Subproject commit c95f7b6d1b9076199847c09791d44ae914d4775b