Build : Upgrade the build/install process

infiniteHQ · Apr 28, 2024 · 57283a9 · 57283a9
1 parent e30546c
commit 57283a9
Show file tree

Hide file tree

Showing 16 changed files with 289 additions and 312 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 cmake_minimum_required(VERSION 3.16)
 project(vortex)
 
@@ -25,12 +24,9 @@ target_include_directories(vortex_shared PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/tools/editor
 )
 
-# Ajouter d'autres dépendances ou configurations pour la bibliothèque partagée
-
 # Liste des fichiers sources pour l'exécutable principal
 file(GLOB_RECURSE VORTEX_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/main/src/*.cpp")
 
-
 # Add editor
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools/editor editor_build)
 target_link_libraries(vortex_shared PUBLIC editor)
@@ -50,3 +46,31 @@ install(TARGETS vortex DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/build/bin)
 
 # Installation de la bibliothèque partagée dans /lib
 install(TARGETS vortex_shared LIBRARY DESTINATION /lib)
+
+# Définir le répertoire d'installation pour les fichiers d'en-tête
+set(INSTALL_INCLUDE_DIR /usr/include/Vortex)
+
+# Installation des fichiers d'en-tête de /main/include
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/main/include/
+        DESTINATION ${INSTALL_INCLUDE_DIR}/main/include/
+        PATTERN "*.h"
+        PATTERN "*.hpp"
+        PATTERN "*.inl"
+)
+
+# Installation des fichiers d'en-tête de /tools/editor/app/include
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tools/editor/app/
+        DESTINATION ${INSTALL_INCLUDE_DIR}/tools/editor/app/
+        PATTERN "*.h"
+        PATTERN "*.hpp"
+        PATTERN "*.inl"
+)
+
+# Installation des fichiers d'en-tête de /lib
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/
+        DESTINATION ${INSTALL_INCLUDE_DIR}/lib
+        FILES_MATCHING 
+        PATTERN "*.h"
+        PATTERN "*.hpp"
+        PATTERN "*.inl"
+)
diff --git a/build/bin/vortex b/build/bin/vortex
diff --git a/main.cpp b/main.cpp
@@ -3,7 +3,7 @@
 #include <thread>
 #include <fstream>
 
-#include "./tools/editor/app/src/editor.h"
+#include "./tools/editor/app/include/editor.h"
 #include "./main/include/vortex.h"
 #include "./lib/uikit/src/EntryPoint.h"
 

diff --git a/main/include/vortex.h b/main/include/vortex.h
@@ -65,25 +65,27 @@
 #include <dirent.h>
 #include <deque>
 
+
+namespace fs = std::filesystem;
+
+#ifndef VORTEX_API
+#define VORTEX_API
+#endif
+#ifndef VORTEX_EXT_API
+#define VORTEX_EXT_API VORTEX_API
+#endif
+
+
 #include "../../lib/uikit/lib/imgui/imgui.h"
 #include "../../lib/uikit/lib/imgui/imgui_internal.h"
 #include "../../lib/uikit/lib/imgui/backends/imgui_impl_vulkan.h"
 #include "../../lib/uikit/lib/imgui/backends/imgui_impl_glfw.h"
 #include "../../lib/uikit/lib/stb-image/stb_image.h"
-// #include "../../lib/glm/glm/glm.hpp"
 #include "../../lib/uikit/lib/glfw/include/GLFW/glfw3.h"
 #include "../../lib/spdlog/include/spdlog/spdlog.h"
-
 #include "../../lib/json/single_include/nlohmann/json.hpp"
 
-namespace fs = std::filesystem;
 
-#ifndef VORTEX_API
-#define VORTEX_API
-#endif
-#ifndef VORTEX_EXT_API
-#define VORTEX_EXT_API VORTEX_API
-#endif
 
 // Helper Macros
 #ifndef VX_ASSERT

diff --git a/main/include/vortex_internals.h b/main/include/vortex_internals.h
@@ -123,18 +123,6 @@ extern VORTEX_API VxContext *CVortexMaker; // Current implicit context pointer
 #define Vx_BASE64ENCODE(_toencodebuffer) base64_encode(_toencodebuffer);
 #define Vx_BASE64DECODE(_todecodebuffer) base64_decode(_todecodebuffer);
 
-//-----------------------------------------------------------------------------
-// (Base structure) VortexMakerMatrix
-//-----------------------------------------------------------------------------
-// A matrix is a point of matrix can interact with each others
-//-----------------------------------------------------------------------------
-
-struct hRandom {
-  static hString GenerateUUIDv4();
-  static hString Generate6CharID();
-};
-//-----------------------------------------------------------------------------
-
 //_____________________________________________________________________________
 
 struct VortexMakerDebugAllocInfo {

diff --git a/main/src/vortex.cpp b/main/src/vortex.cpp
@@ -316,6 +316,8 @@ void VortexMaker::DebugAllocHook(VortexMakerDebugAllocInfo *info, void *ptr,
     }*/
 }
 
+
+
 //-----------------------------------------------------------------------------
 // [SECTION] ImGuiTextBuffer, ImGuiTextIndex
 //-----------------------------------------------------------------------------

diff --git a/tools/editor/CMakeLists.txt b/tools/editor/CMakeLists.txt
@@ -26,55 +26,15 @@ add_library(editor
     ${CMAKE_CURRENT_SOURCE_DIR}/app/core/ProjectViewer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/app/core/ModuleManager.cpp
 
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Host/wins/UI_ContentWindow.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Host/wins/UI_MainSettings.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Host/wins/UI_ParameterWindow.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Host/wins/UI_FullBuild.cpp
-   # ${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Host/wins/UI_AssetsViewer.cpp
-   # ${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Host/wins/UI_SnapshotUtility.cpp
-   # ${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Host/wins/UI_CurrentHostPreview.cpp
-  #  ${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Host/wins/UI_TasksEditor.cpp
-  #  ${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Host/wins/UI_VolatileTasks.cpp
-  #  ${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Host/HostInstance.cpp
-
- #    ${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/GPOS/GPOSInstance.cpp
-  #   ${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/GPOS/wins/UI_MainSettings.cpp
-
-    # ${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Assets/Script/wins/UI_MainSettings.cpp
-    # ${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Assets/Script/wins/UI_FileBrowser.cpp
-    # ${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Assets/Script/ScriptInstance.cpp
-
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Assets/Package/PackageInstance.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Assets/Package/wins/UI_MainSettings.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Assets/Package/wins/UI_ActionsEditor.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Assets/Package/wins/UI_CompilationArguments.cpp
-
-  #   ${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Assets/Tasklist/wins/UI_MainSettings.cpp
-   #  ${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Assets/Tasklist/TasklistInstance.cpp
-
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Toolchain/ToolchainInstance.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Toolchain/wins/UI_ContentWindow.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Toolchain/wins/UI_AssetsViewer.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Toolchain/wins/UI_MainSettings.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Toolchain/wins/UI_FullBuild.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Toolchain/wins/UI_TasksEditor.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Toolchain/wins/UI_ManualBuild.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Toolchain/wins/UI_VolatileTasks.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Toolchain/wins/UI_SnapshotUtility.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Toolchain/wins/UI_CurrentToolchainPreview.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Components/Toolchain/wins/UI_ParameterWindow.cpp
-
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Utils/Report/ReportInstance.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Utils/ModuleDetails/ModuleDetails.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Utils/TextEditor/TextEditor.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Utils/TextEditor/TextEditorInstance.cpp
 )
 
 
 target_include_directories(editor PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../)
 
 # editor requirements
 find_package(Vulkan REQUIRED)
+option(SPDLOG_INSTALL "Enable installation of spdlog" ON)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../lib/spdlog spdlog_build)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../lib/uikit/lib/glfw glfw_build)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../lib/uikit/lib/glm glm_build)
@@ -87,4 +47,5 @@ target_link_libraries(editor PUBLIC glm)
 target_link_libraries(editor PUBLIC stbimage)
 target_link_libraries(editor PUBLIC spdlog)
 
+
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/uikit/platform/GUI/editor/icon.png DESTINATION /usr/include/vortex)
diff --git a/tools/editor/app/core/ContentBrowser.hpp b/tools/editor/app/core/ContentBrowser.hpp
@@ -2,7 +2,7 @@
 #ifndef CONTENTBROWSER_H
 #define CONTENTBROWSER_H
 
-#include "../src/instanceFactory.h"
+#include "../include/instanceFactory.h"
 
 	class ContentBrowserPanel
 	{
-Original file line number
+Diff line change
@@ Expand Up @@
         }*/
     }
     //-----------------------------------------------------------------------------
     // [SECTION] ImGuiTextBuffer, ImGuiTextIndex
     //-----------------------------------------------------------------------------
@@ Expand Down @@