Tweak runtime target structure

albin-johansson · Jul 9, 2024 · 60ef604 · 60ef604
1 parent 08aeaa9
commit 60ef604
Show file tree

Hide file tree

Showing 16 changed files with 54 additions and 47 deletions.
diff --git a/source/runtime/CMakeLists.txt b/source/runtime/CMakeLists.txt
@@ -1,49 +1,3 @@
 project(tactile-runtime CXX)
 
-add_library(tactile-runtime SHARED)
-add_library(tactile::runtime ALIAS tactile-runtime)
-
-target_sources(tactile-runtime
-               PRIVATE
-               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/api.hpp"
-               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/launcher.hpp"
-               "${PROJECT_SOURCE_DIR}/src/tactile/runtime/launcher.cpp"
-               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/plugin.hpp"
-               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/plugin_instance.hpp"
-               "${PROJECT_SOURCE_DIR}/src/tactile/runtime/plugin_instance.cpp"
-               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/protobuf_context.hpp"
-               "${PROJECT_SOURCE_DIR}/src/tactile/runtime/protobuf_context.cpp"
-               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/runtime.hpp"
-               "${PROJECT_SOURCE_DIR}/src/tactile/runtime/runtime.cpp"
-               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/sdl_context.hpp"
-               "${PROJECT_SOURCE_DIR}/src/tactile/runtime/sdl_context.cpp"
-               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/window.hpp"
-               "${PROJECT_SOURCE_DIR}/src/tactile/runtime/window.cpp"
-               )
-
-tactile_prepare_target(tactile-runtime)
-
-target_include_directories(tactile-runtime
-                           PUBLIC
-                           "${PROJECT_SOURCE_DIR}/inc"
-                           )
-
-target_compile_definitions(tactile-runtime
-                           PRIVATE
-                           "TACTILE_BUILDING_RUNTIME"
-                           "TACTILE_ENABLE_ZLIB_COMPRESSION"
-                           "TACTILE_ENABLE_ZSTD_COMPRESSION"
-                           "TACTILE_ENABLE_YAML_FORMAT"
-                           "TACTILE_ENABLE_OPENGL_RENDERER"
-                           )
-
-target_link_libraries(tactile-runtime
-                      PUBLIC
-                      tactile::base
-
-                      PRIVATE
-                      tactile::core
-                      protobuf::libprotobuf
-                      SDL2::SDL2
-                      imgui::imgui
-                      )
+add_subdirectory(lib)
diff --git a/source/runtime/lib/CMakeLists.txt b/source/runtime/lib/CMakeLists.txt
@@ -0,0 +1,53 @@
+project(tactile-runtime-lib CXX)
+
+add_library(tactile-runtime SHARED)
+add_library(tactile::runtime ALIAS tactile-runtime)
+
+target_sources(tactile-runtime
+               PRIVATE
+               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/api.hpp"
+               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/launcher.hpp"
+               "${PROJECT_SOURCE_DIR}/src/tactile/runtime/launcher.cpp"
+               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/plugin.hpp"
+               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/plugin_instance.hpp"
+               "${PROJECT_SOURCE_DIR}/src/tactile/runtime/plugin_instance.cpp"
+               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/protobuf_context.hpp"
+               "${PROJECT_SOURCE_DIR}/src/tactile/runtime/protobuf_context.cpp"
+               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/runtime.hpp"
+               "${PROJECT_SOURCE_DIR}/src/tactile/runtime/runtime.cpp"
+               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/sdl_context.hpp"
+               "${PROJECT_SOURCE_DIR}/src/tactile/runtime/sdl_context.cpp"
+               "${PROJECT_SOURCE_DIR}/inc/tactile/runtime/window.hpp"
+               "${PROJECT_SOURCE_DIR}/src/tactile/runtime/window.cpp"
+               )
+
+tactile_prepare_target(tactile-runtime)
+
+target_include_directories(tactile-runtime
+                           PUBLIC
+                           "${PROJECT_SOURCE_DIR}/inc"
+                           )
+
+target_compile_definitions(tactile-runtime
+                           PRIVATE
+                           "TACTILE_BUILDING_RUNTIME"
+                           "TACTILE_ENABLE_ZLIB_COMPRESSION"
+                           "TACTILE_ENABLE_ZSTD_COMPRESSION"
+                           "TACTILE_ENABLE_YAML_FORMAT"
+                           # "TACTILE_ENABLE_TILED_TMJ_FORMAT"
+                           # "TACTILE_ENABLE_TILED_TMX_FORMAT"
+                           # "TACTILE_ENABLE_GODOT_TSCN_FORMAT"
+                           "TACTILE_ENABLE_OPENGL_RENDERER"
+                           # "TACTILE_ENABLE_VULKAN_RENDERER"
+                           )
+
+target_link_libraries(tactile-runtime
+                      PUBLIC
+                      tactile::base
+
+                      PRIVATE
+                      tactile::core
+                      protobuf::libprotobuf
+                      SDL2::SDL2
+                      imgui::imgui
+                      )
diff --git a/source/runtime/inc/tactile/runtime/api.hpp → ...e/runtime/lib/inc/tactile/runtime/api.hpp b/source/runtime/inc/tactile/runtime/api.hpp → ...e/runtime/lib/inc/tactile/runtime/api.hpp
diff --git a/.../runtime/inc/tactile/runtime/launcher.hpp → ...time/lib/inc/tactile/runtime/launcher.hpp b/.../runtime/inc/tactile/runtime/launcher.hpp → ...time/lib/inc/tactile/runtime/launcher.hpp
diff --git a/...ce/runtime/inc/tactile/runtime/plugin.hpp → ...untime/lib/inc/tactile/runtime/plugin.hpp b/...ce/runtime/inc/tactile/runtime/plugin.hpp → ...untime/lib/inc/tactile/runtime/plugin.hpp
diff --git a/...e/inc/tactile/runtime/plugin_instance.hpp → ...b/inc/tactile/runtime/plugin_instance.hpp b/...e/inc/tactile/runtime/plugin_instance.hpp → ...b/inc/tactile/runtime/plugin_instance.hpp
diff --git a/.../inc/tactile/runtime/protobuf_context.hpp → .../inc/tactile/runtime/protobuf_context.hpp b/.../inc/tactile/runtime/protobuf_context.hpp → .../inc/tactile/runtime/protobuf_context.hpp
diff --git a/...e/runtime/inc/tactile/runtime/runtime.hpp → ...ntime/lib/inc/tactile/runtime/runtime.hpp b/...e/runtime/inc/tactile/runtime/runtime.hpp → ...ntime/lib/inc/tactile/runtime/runtime.hpp
diff --git a/...ntime/inc/tactile/runtime/sdl_context.hpp → ...e/lib/inc/tactile/runtime/sdl_context.hpp b/...ntime/inc/tactile/runtime/sdl_context.hpp → ...e/lib/inc/tactile/runtime/sdl_context.hpp
diff --git a/...ce/runtime/inc/tactile/runtime/window.hpp → ...untime/lib/inc/tactile/runtime/window.hpp b/...ce/runtime/inc/tactile/runtime/window.hpp → ...untime/lib/inc/tactile/runtime/window.hpp
diff --git a/.../runtime/src/tactile/runtime/launcher.cpp → ...time/lib/src/tactile/runtime/launcher.cpp b/.../runtime/src/tactile/runtime/launcher.cpp → ...time/lib/src/tactile/runtime/launcher.cpp
diff --git a/...e/src/tactile/runtime/plugin_instance.cpp → ...b/src/tactile/runtime/plugin_instance.cpp b/...e/src/tactile/runtime/plugin_instance.cpp → ...b/src/tactile/runtime/plugin_instance.cpp
diff --git a/.../src/tactile/runtime/protobuf_context.cpp → .../src/tactile/runtime/protobuf_context.cpp b/.../src/tactile/runtime/protobuf_context.cpp → .../src/tactile/runtime/protobuf_context.cpp
diff --git a/...e/runtime/src/tactile/runtime/runtime.cpp → ...ntime/lib/src/tactile/runtime/runtime.cpp b/...e/runtime/src/tactile/runtime/runtime.cpp → ...ntime/lib/src/tactile/runtime/runtime.cpp
diff --git a/...ntime/src/tactile/runtime/sdl_context.cpp → ...e/lib/src/tactile/runtime/sdl_context.cpp b/...ntime/src/tactile/runtime/sdl_context.cpp → ...e/lib/src/tactile/runtime/sdl_context.cpp
diff --git a/...ce/runtime/src/tactile/runtime/window.cpp → ...untime/lib/src/tactile/runtime/window.cpp b/...ce/runtime/src/tactile/runtime/window.cpp → ...untime/lib/src/tactile/runtime/window.cpp