for issue #80 : moved st_tree into 3rd parts folder

NevilClavain · Jul 23, 2023 · 4280450 · 4280450
1 parent 08465c9
commit 4280450
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -60,6 +60,8 @@ set(assimp_lib_dir ${CMAKE_SOURCE_DIR}/thirdparts/Assimp-4.1.0/sdk/lib/x86)
 
 set(md5_include_dir ${CMAKE_SOURCE_DIR}/thirdparts/md5/sdk/include)
 
+set(st_tree_include_dir ${CMAKE_SOURCE_DIR}/thirdparts/st_tree/sdk/include)
+
 # core, plugins and runtimes
 add_subdirectory(drawspacecore_project)
 

diff --git a/drawspacecore_project/CMakeLists.txt b/drawspacecore_project/CMakeLists.txt
@@ -28,6 +28,7 @@ include_directories(${assimp_include_dir})
 include_directories(${bullet_include_dir})
 include_directories(${jsonjsmn_include_dir})
 include_directories(${md5_include_dir})
+include_directories(${st_tree_include_dir})
 
 include_directories(${CMAKE_SOURCE_DIR}/CORE_logger/src)
 

diff --git a/lua_core/CMakeLists.txt b/lua_core/CMakeLists.txt
@@ -28,6 +28,7 @@ include_directories(${physfs_include_dir})
 include_directories(${assimp_include_dir})
 include_directories(${bullet_include_dir})
 include_directories(${jsonjsmn_include_dir})
+include_directories(${st_tree_include_dir})
 
 include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_SOURCE_DIR}/CORE_logger/src)

diff --git a/lua_extensions/impostors_luaext/CMakeLists.txt b/lua_extensions/impostors_luaext/CMakeLists.txt
@@ -34,6 +34,8 @@ link_directories(${assimp_lib_dir})
 
 link_directories(${bullet_lib_dir})
 
+include_directories(${st_tree_include_dir})
+
 include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_SOURCE_DIR}/CORE_logger/src)
 include_directories(${CMAKE_SOURCE_DIR}/lua_core/src)

diff --git a/lua_extensions/mesh_luaext/CMakeLists.txt b/lua_extensions/mesh_luaext/CMakeLists.txt
@@ -38,6 +38,8 @@ link_directories(${assimp_lib_dir})
 include_directories(${bullet_include_dir})
 link_directories(${bullet_lib_dir})
 
+include_directories(${st_tree_include_dir})
+
 include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_SOURCE_DIR}/CORE_logger/src)
 include_directories(${CMAKE_SOURCE_DIR}/lua_core/src)

diff --git a/lua_extensions/planets_luaext/CMakeLists.txt b/lua_extensions/planets_luaext/CMakeLists.txt
@@ -37,6 +37,8 @@ link_directories(${assimp_lib_dir})
 include_directories(${bullet_include_dir})
 link_directories(${bullet_lib_dir})
 
+include_directories(${st_tree_include_dir})
+
 include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_SOURCE_DIR}/CORE_logger/src)
 include_directories(${CMAKE_SOURCE_DIR}/lua_core/src)

diff --git a/lua_extensions/skybox_luaext/CMakeLists.txt b/lua_extensions/skybox_luaext/CMakeLists.txt
@@ -38,6 +38,8 @@ link_directories(${assimp_lib_dir})
 include_directories(${bullet_include_dir})
 link_directories(${bullet_lib_dir})
 
+include_directories(${st_tree_include_dir})
+
 include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_SOURCE_DIR}/CORE_logger/src)
 include_directories(${CMAKE_SOURCE_DIR}/lua_core/src)

diff --git a/modules/gameroom_project/CMakeLists.txt b/modules/gameroom_project/CMakeLists.txt
@@ -38,6 +38,8 @@ link_directories(${jsonjsmn_lib_dir})
 include_directories(${assimp_include_dir})
 link_directories(${assimp_lib_dir})
 
+include_directories(${st_tree_include_dir})
+
 include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_SOURCE_DIR}/CORE_logger/src)
 include_directories(${CMAKE_SOURCE_DIR}/lua_core/src)

diff --git a/rt_project/CMakeLists.txt b/rt_project/CMakeLists.txt
@@ -37,6 +37,8 @@ link_directories(${physfs_lib_dir})
 include_directories(${bullet_include_dir})
 link_directories(${bullet_lib_dir})
 
+include_directories(${st_tree_include_dir})
+
 file(
         GLOB_RECURSE
         source_files

diff --git a/samples/cpp/impostors/CMakeLists.txt b/samples/cpp/impostors/CMakeLists.txt
@@ -37,6 +37,8 @@ link_directories(${jsonjsmn_lib_dir})
 include_directories(${assimp_include_dir})
 link_directories(${assimp_lib_dir})
 
+include_directories(${st_tree_include_dir})
+
 include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_SOURCE_DIR}/CORE_logger/src)
 

diff --git a/src/st_tree.h → thirdparts/st_tree/sdk/include/st_tree.h b/src/st_tree.h → thirdparts/st_tree/sdk/include/st_tree.h
diff --git a/src/st_tree_detail.h → ...arts/st_tree/sdk/include/st_tree_detail.h b/src/st_tree_detail.h → ...arts/st_tree/sdk/include/st_tree_detail.h
diff --git a/src/st_tree_iterators.h → ...s/st_tree/sdk/include/st_tree_iterators.h b/src/st_tree_iterators.h → ...s/st_tree/sdk/include/st_tree_iterators.h
diff --git a/src/st_tree_nodes.h → ...parts/st_tree/sdk/include/st_tree_nodes.h b/src/st_tree_nodes.h → ...parts/st_tree/sdk/include/st_tree_nodes.h