Merge remote-tracking branch 'origin/dev' into feature/RB-22-network

X-R-G-B · Sep 27, 2023 · b8fe0ff · b8fe0ff
1 parent cc24970
commit b8fe0ff
Show file tree

Hide file tree

Showing 6 changed files with 338 additions and 238 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -20,3 +20,4 @@ target_sources(
 
 add_subdirectory(Client)
 add_subdirectory(ECS)
+add_subdirectory(Nitwork)
diff --git a/src/Nitwork.hpp b/src/Nitwork.hpp
diff --git a/src/Nitwork/CMakeLists.txt b/src/Nitwork/CMakeLists.txt
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 3.15)
+
+target_include_directories(
+    ${PROJECT_NAME_CLIENT}
+    PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+target_include_directories(
+    ${PROJECT_NAME_SERVER}
+    PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_sources(
+    ${PROJECT_NAME_CLIENT}
+    PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/Nitwork.cpp
+)
+
+target_sources(
+    ${PROJECT_NAME_SERVER}
+    PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/Nitwork.cpp
+)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,3 +20,4 @@ target_sources(

		add_subdirectory(Client)
		add_subdirectory(ECS)
		add_subdirectory(Nitwork)