From 2c4198fbc628d1517f3d393b36e00f9b6a18efc7 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Wed, 7 Jan 2026 04:35:00 +0900 Subject: [PATCH] restructure --- CMakeLists.txt | 2 +- engine/CMakeLists.txt | 10 ++++++++++ engine/net/CMakeLists.txt | 2 ++ {resource => engine/resource}/shadow.fs | 0 {resource => engine/resource}/shadow.vs | 0 5 files changed, 13 insertions(+), 1 deletion(-) rename {resource => engine/resource}/shadow.fs (100%) rename {resource => engine/resource}/shadow.vs (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6578505..d3ea94b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,6 @@ add_subdirectory(external/milsko) add_subdirectory(engine) install( - FILES resource/logo.png resource/font.png resource/shadow.vs resource/shadow.fs + FILES resource/logo.png resource/font.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/assaultfish ) diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index d42aa8a..cd3df3d 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -4,6 +4,16 @@ project(assaultfish) include(GNUInstallDirs) set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + +macro(install_target name) + install( + TARGETS ${name} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) +endmacro() + add_subdirectory(external/glad) add_subdirectory(net) diff --git a/engine/net/CMakeLists.txt b/engine/net/CMakeLists.txt index 050d397..3a35aff 100644 --- a/engine/net/CMakeLists.txt +++ b/engine/net/CMakeLists.txt @@ -12,3 +12,5 @@ target_include_directories(gbnet PRIVATE ${ZLIB_INCLUDE_DIRS}) target_link_options(gbnet PRIVATE ${ZLIB_LDFLAGS_OTHER}) target_link_directories(gbnet PRIVATE ${ZLIB_LIBRARY_DIRS}) target_link_libraries(gbnet PRIVATE ${ZLIB_LIBRARIES}) + +install_target(gbnet) diff --git a/resource/shadow.fs b/engine/resource/shadow.fs similarity index 100% rename from resource/shadow.fs rename to engine/resource/shadow.fs diff --git a/resource/shadow.vs b/engine/resource/shadow.vs similarity index 100% rename from resource/shadow.vs rename to engine/resource/shadow.vs