code: make modules standalone

2021-01-19 11:43:56 +01:00 · 2021-01-19 11:43:56 +01:00 · 9085ae8da2
parent f241a0d280
commit 9085ae8da2
10 changed files with 6 additions and 4 deletions
--- a/code/apps/server/CMakeLists.txt
+++ b/code/apps/server/CMakeLists.txt
@ -1,5 +1,4 @@
-file(GLOB MODULES header/modules/*.h source/modules/*.c)
-add_library(eco2d-server-modules STATIC ${MODULES})
+add_subdirectory(modules)

 add_executable(eco2d-server
  source/main.c
@ -17,6 +16,6 @@ add_executable(eco2d-server
  header/world/blocks_info.h
 )

-include_directories(eco2d-server header)
-target_link_libraries(eco2d-server eco2d-common eco2d-server-modules flecs-bundle cwpack)
+include_directories(eco2d-server header modules)
+target_link_libraries(eco2d-server eco2d-common eco2d-modules flecs-bundle cwpack)
 link_system_libs(eco2d-server)
--- a/code/apps/server/modules/CMakeLists.txt
+++ b/code/apps/server/modules/CMakeLists.txt
@ -0,0 +1,3 @@
+file(GLOB MODULES modules/*.h source/*.c)
+add_library(eco2d-modules STATIC ${MODULES})
+include_directories(eco2d-modules .)
--- a/code/apps/server/modules/modules/controllers.h
+++ b/code/apps/server/modules/modules/controllers.h
--- a/code/apps/server/modules/modules/general.h
+++ b/code/apps/server/modules/modules/general.h
--- a/code/apps/server/modules/modules/net.h
+++ b/code/apps/server/modules/modules/net.h
--- a/code/apps/server/modules/modules/physics.h
+++ b/code/apps/server/modules/modules/physics.h
--- a/code/apps/server/modules/source/controllers.c
+++ b/code/apps/server/modules/source/controllers.c
--- a/code/apps/server/modules/source/general.c
+++ b/code/apps/server/modules/source/general.c
--- a/code/apps/server/modules/source/net.c
+++ b/code/apps/server/modules/source/net.c
--- a/code/apps/server/modules/source/physics.c
+++ b/code/apps/server/modules/source/physics.c