diff --git a/Source/Core/Editor/CMakeLists.txt b/Source/Core/Editor/CMakeLists.txt index f951f44aa7..6ad3340f6e 100644 --- a/Source/Core/Editor/CMakeLists.txt +++ b/Source/Core/Editor/CMakeLists.txt @@ -38,6 +38,8 @@ target_link_libraries(VisualEditor ERS_Editor_UserProfileManager ERS_Editor_3DCursor + ERS_SceneManager + Menu_File Menu_View Menu_Window diff --git a/Source/Core/Editor/GUI.h b/Source/Core/Editor/GUI.h index 300c174cfd..a5ca3f5cd2 100644 --- a/Source/Core/Editor/GUI.h +++ b/Source/Core/Editor/GUI.h @@ -12,13 +12,11 @@ #include #include - -#include - - #include #include +#include + #include // Internal Libraries (BG convention: use <> instead of "") @@ -29,12 +27,12 @@ #include #include -#include #include +#include #include +#include #include -#include #include #include diff --git a/Source/Core/Editor/Menus/GUI_Menu_Debug/CMakeLists.txt b/Source/Core/Editor/Menus/GUI_Menu_Debug/CMakeLists.txt index ca09f49369..7e2f7ef991 100644 --- a/Source/Core/Editor/Menus/GUI_Menu_Debug/CMakeLists.txt +++ b/Source/Core/Editor/Menus/GUI_Menu_Debug/CMakeLists.txt @@ -21,7 +21,6 @@ add_library(Menu_Debug # Link 3rd Party Libs target_link_libraries(Menu_Debug glad - glfw IMGUI ) @@ -31,6 +30,8 @@ target_link_libraries(Menu_Debug GUI_Window_TestEditor ERS_STRUCT_SystemUtils + + ERS_CLASS_LoggingSystem ) target_include_directories(Menu_Debug PUBLIC ./) diff --git a/Source/Core/Editor/Menus/GUI_Menu_File/CMakeLists.txt b/Source/Core/Editor/Menus/GUI_Menu_File/CMakeLists.txt index 5c2b11b13f..cae0fc467b 100644 --- a/Source/Core/Editor/Menus/GUI_Menu_File/CMakeLists.txt +++ b/Source/Core/Editor/Menus/GUI_Menu_File/CMakeLists.txt @@ -20,9 +20,8 @@ add_library(Menu_File # Link 3rd Party Libs target_link_libraries(Menu_File - glad - glfw IMGUI + yaml-cpp ) # Link Internal Libs @@ -33,14 +32,15 @@ target_link_libraries(Menu_File ERS_Editor_ImportAsset - ERS_SceneWriter ERS_ProjectLoader - + ERS_SceneWriter ERS_SceneManager + ERS_STRUCT_Scene GUI_Window_ProjectSettings GUI_Window_ShaderEditor + ERS_CLASS_VisualRenderer ) diff --git a/Source/Core/Editor/Menus/GUI_Menu_File/GUI_Menu_File.h b/Source/Core/Editor/Menus/GUI_Menu_File/GUI_Menu_File.h index 6e1a9b4b0f..fa2a15069a 100644 --- a/Source/Core/Editor/Menus/GUI_Menu_File/GUI_Menu_File.h +++ b/Source/Core/Editor/Menus/GUI_Menu_File/GUI_Menu_File.h @@ -22,10 +22,10 @@ #include #include #include -#include #include +#include #include #include diff --git a/Source/Core/Editor/Menus/GUI_Menu_File/Utils/Import_Asset/CMakeLists.txt b/Source/Core/Editor/Menus/GUI_Menu_File/Utils/Import_Asset/CMakeLists.txt index e2849f7f9a..7a14fa8a21 100644 --- a/Source/Core/Editor/Menus/GUI_Menu_File/Utils/Import_Asset/CMakeLists.txt +++ b/Source/Core/Editor/Menus/GUI_Menu_File/Utils/Import_Asset/CMakeLists.txt @@ -24,8 +24,11 @@ set_property(TARGET ERS_Editor_ImportAsset PROPERTY CXX_STANDARD 17) # Link 3rd Party Libs target_link_libraries(ERS_Editor_ImportAsset yaml-cpp + glm IMGUI ImGuiFileDialog + assimp + FreeImage ) # Link Internal Libs @@ -33,6 +36,12 @@ target_link_libraries(ERS_Editor_ImportAsset ERS_CLASS_LoggingSystem ERS_STRUCT_SystemUtils + ERS_STRUCT_Mesh + ERS_STRUCT_Texture + ERS_STRUCT_Vertex + ERS_STRUCT_Model + ERS_STRUCT_IOData + GUI_Window_ImportProgressBar ) diff --git a/Source/Core/Editor/Menus/GUI_Menu_Settings/CMakeLists.txt b/Source/Core/Editor/Menus/GUI_Menu_Settings/CMakeLists.txt index d369e866bc..ae46b9c65c 100644 --- a/Source/Core/Editor/Menus/GUI_Menu_Settings/CMakeLists.txt +++ b/Source/Core/Editor/Menus/GUI_Menu_Settings/CMakeLists.txt @@ -17,8 +17,6 @@ add_library(Menu_Settings # Link 3rd Party Libs target_link_libraries(Menu_Settings - glad - glfw IMGUI ) diff --git a/Source/Core/Editor/Menus/GUI_Menu_View/CMakeLists.txt b/Source/Core/Editor/Menus/GUI_Menu_View/CMakeLists.txt index 3b8ebf358c..86d1b46bae 100644 --- a/Source/Core/Editor/Menus/GUI_Menu_View/CMakeLists.txt +++ b/Source/Core/Editor/Menus/GUI_Menu_View/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(Menu_View # Add Source Files (.cpp) - "GUI_Menu_View.cpp" # Add Header Files (.h) @@ -19,8 +18,6 @@ add_library(Menu_View # Link 3rd Party Libs target_link_libraries(Menu_View - glad - glfw IMGUI ) @@ -31,9 +28,9 @@ target_link_libraries(Menu_View ERS_Editor_ThemeManager ERS_Editor_FontManager - GUI_Window_About - GUI_Window_ThemeSelector + + GUI_Window_About ) target_include_directories(Menu_View PUBLIC ./) diff --git a/Source/Core/Editor/Menus/GUI_Menu_Window/CMakeLists.txt b/Source/Core/Editor/Menus/GUI_Menu_Window/CMakeLists.txt index 7d08f84790..6ab545568c 100644 --- a/Source/Core/Editor/Menus/GUI_Menu_Window/CMakeLists.txt +++ b/Source/Core/Editor/Menus/GUI_Menu_Window/CMakeLists.txt @@ -18,17 +18,16 @@ add_library(Menu_Window # Link 3rd Party Libs target_link_libraries(Menu_Window - glad - glfw IMGUI ) # Link Internal Libs target_link_libraries(Menu_Window + ERS_CLASS_VisualRenderer + ERS_STRUCT_SystemUtils ERS_STRUCT_ProjectUtils - ERS_CLASS_VisualRenderer GUI_Window_SceneTree GUI_Window_SystemLog diff --git a/Source/Core/Editor/Menus/GUI_Menu_Window/GUI_Menu_Window.h b/Source/Core/Editor/Menus/GUI_Menu_Window/GUI_Menu_Window.h index 224d48e63e..ab7c931460 100644 --- a/Source/Core/Editor/Menus/GUI_Menu_Window/GUI_Menu_Window.h +++ b/Source/Core/Editor/Menus/GUI_Menu_Window/GUI_Menu_Window.h @@ -21,20 +21,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include - #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include diff --git a/Source/Core/Editor/Utils/ERS_Editor_3DCursor/CMakeLists.txt b/Source/Core/Editor/Utils/ERS_Editor_3DCursor/CMakeLists.txt index 9611509a69..1011c25520 100644 --- a/Source/Core/Editor/Utils/ERS_Editor_3DCursor/CMakeLists.txt +++ b/Source/Core/Editor/Utils/ERS_Editor_3DCursor/CMakeLists.txt @@ -18,8 +18,6 @@ add_library(ERS_Editor_3DCursor # Link 3rd Party Libs target_link_libraries(ERS_Editor_3DCursor glm - glad - glfw IMGUI ImGuizmo ) @@ -27,6 +25,7 @@ target_link_libraries(ERS_Editor_3DCursor # Link Internal Libs target_link_libraries(ERS_Editor_3DCursor ERS_CLASS_LoggingSystem + ERS_STRUCT_Camera ERS_STRUCT_LocRotScale ) diff --git a/Source/Core/Editor/Utils/ERS_Editor_3DCursor/ERS_Editor_3DCursor.h b/Source/Core/Editor/Utils/ERS_Editor_3DCursor/ERS_Editor_3DCursor.h index 6f1ca6850c..3c4549ca16 100644 --- a/Source/Core/Editor/Utils/ERS_Editor_3DCursor/ERS_Editor_3DCursor.h +++ b/Source/Core/Editor/Utils/ERS_Editor_3DCursor/ERS_Editor_3DCursor.h @@ -21,6 +21,7 @@ // Internal Libraries (BG convention: use <> instead of "") #include + #include #include diff --git a/Source/Core/Editor/Utils/ERS_Editor_UserProfileManager/CMakeLists.txt b/Source/Core/Editor/Utils/ERS_Editor_UserProfileManager/CMakeLists.txt index 951bb30480..88c3905798 100644 --- a/Source/Core/Editor/Utils/ERS_Editor_UserProfileManager/CMakeLists.txt +++ b/Source/Core/Editor/Utils/ERS_Editor_UserProfileManager/CMakeLists.txt @@ -19,7 +19,6 @@ set_property(TARGET ERS_Editor_UserProfileManager PROPERTY CXX_STANDARD 17) # Link 3rd Party Libs target_link_libraries(ERS_Editor_UserProfileManager yaml-cpp - IMGUI ) # Link Internal Libs diff --git a/Source/Core/Editor/Windows/GUI_Window_FramerateHistogram/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_FramerateHistogram/CMakeLists.txt index 4d6f62777c..a653927797 100644 --- a/Source/Core/Editor/Windows/GUI_Window_FramerateHistogram/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_FramerateHistogram/CMakeLists.txt @@ -10,7 +10,6 @@ add_library(GUI_Window_FramerateHistogram # Link 3rd Party Libs target_link_libraries(GUI_Window_FramerateHistogram IMGUI - ImPlot ) # Link Internal Libs diff --git a/Source/Core/Editor/Windows/GUI_Window_FrameratePlot/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_FrameratePlot/CMakeLists.txt index db2ed286d8..0429b37276 100644 --- a/Source/Core/Editor/Windows/GUI_Window_FrameratePlot/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_FrameratePlot/CMakeLists.txt @@ -10,7 +10,6 @@ add_library(GUI_Window_FrameratePlot # Link 3rd Party Libs target_link_libraries(GUI_Window_FrameratePlot IMGUI - ImPlot ) # Link Internal Libs diff --git a/Source/Core/Editor/Windows/GUI_Window_ImportProgressBar/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_ImportProgressBar/CMakeLists.txt index c7c57b0155..1fb9f1e733 100644 --- a/Source/Core/Editor/Windows/GUI_Window_ImportProgressBar/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_ImportProgressBar/CMakeLists.txt @@ -17,8 +17,6 @@ add_library(GUI_Window_ImportProgressBar # Link 3rd Party Libs target_link_libraries(GUI_Window_ImportProgressBar - glad - glfw IMGUI ) diff --git a/Source/Core/Editor/Windows/GUI_Window_ObjectProperties/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_ObjectProperties/CMakeLists.txt index 6759c8772e..bec8ac0e77 100644 --- a/Source/Core/Editor/Windows/GUI_Window_ObjectProperties/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_ObjectProperties/CMakeLists.txt @@ -18,7 +18,10 @@ target_link_libraries(GUI_Window_ObjectProperties target_link_libraries(GUI_Window_ObjectProperties ERS_Editor_3DCursor + ERS_STRUCT_ProjectUtils + ERS_STRUCT_LocRotScale + ERS_SceneManager ) diff --git a/Source/Core/Editor/Windows/GUI_Window_RAMGraph/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_RAMGraph/CMakeLists.txt index fe5d3e0dde..11ea069856 100644 --- a/Source/Core/Editor/Windows/GUI_Window_RAMGraph/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_RAMGraph/CMakeLists.txt @@ -15,11 +15,8 @@ target_link_libraries(GUI_Window_RAMGraph # Link Internal Libs target_link_libraries(GUI_Window_RAMGraph - ERS_CLASS_LoggingSystem ERS_STRUCT_SystemUtils - ERS_STRUCT_ProjectUtils - ERS_STRUCT_RendererSettings ERS_STRUCT_HardwareInfo ) diff --git a/Source/Core/Editor/Windows/GUI_Window_RenderingSettings/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_RenderingSettings/CMakeLists.txt index b50afc350b..67e8544f30 100644 --- a/Source/Core/Editor/Windows/GUI_Window_RenderingSettings/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_RenderingSettings/CMakeLists.txt @@ -16,10 +16,7 @@ target_link_libraries(GUI_Window_RenderingSettings # Link Internal Libs target_link_libraries(GUI_Window_RenderingSettings - ERS_CLASS_LoggingSystem - ERS_STRUCT_SystemUtils - ERS_STRUCT_ProjectUtils ERS_STRUCT_RendererSettings ) diff --git a/Source/Core/Editor/Windows/GUI_Window_SystemLog/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_SystemLog/CMakeLists.txt index 353be9e3e6..39dc4558d4 100644 --- a/Source/Core/Editor/Windows/GUI_Window_SystemLog/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_SystemLog/CMakeLists.txt @@ -17,8 +17,6 @@ add_library(GUI_Window_SystemLog # Link 3rd Party Libs target_link_libraries(GUI_Window_SystemLog - glad - glfw IMGUI ) diff --git a/Source/Core/Loader/ERS_ControllerSettingsLoader/CMakeLists.txt b/Source/Core/Loader/ERS_ControllerSettingsLoader/CMakeLists.txt index 7af1231834..157e8ca5a2 100644 --- a/Source/Core/Loader/ERS_ControllerSettingsLoader/CMakeLists.txt +++ b/Source/Core/Loader/ERS_ControllerSettingsLoader/CMakeLists.txt @@ -23,8 +23,8 @@ target_link_libraries(ERS_ControllerSettingsLoader # Link Internal Libs target_link_libraries(ERS_ControllerSettingsLoader ERS_STRUCT_SystemUtils - ERS_STRUCT_ControllerSettings ERS_STRUCT_IOData + ERS_STRUCT_ControllerSettings ) diff --git a/Source/Core/Loader/ERS_ModelLoader/CMakeLists.txt b/Source/Core/Loader/ERS_ModelLoader/CMakeLists.txt index d53937b5f4..f67081c433 100644 --- a/Source/Core/Loader/ERS_ModelLoader/CMakeLists.txt +++ b/Source/Core/Loader/ERS_ModelLoader/CMakeLists.txt @@ -19,8 +19,6 @@ add_library(ERS_ModelLoader target_link_libraries(ERS_ModelLoader yaml-cpp glm - glad - glfw assimp FreeImage ) @@ -30,6 +28,8 @@ target_link_libraries(ERS_ModelLoader ERS_STRUCT_Mesh ERS_STRUCT_Model ERS_STRUCT_Texture + ERS_STRUCT_Vertex + ERS_STRUCT_SystemUtils ) diff --git a/Source/Core/Loader/ERS_ProjectLoader/CMakeLists.txt b/Source/Core/Loader/ERS_ProjectLoader/CMakeLists.txt index dd17a0f68f..540720dc4a 100644 --- a/Source/Core/Loader/ERS_ProjectLoader/CMakeLists.txt +++ b/Source/Core/Loader/ERS_ProjectLoader/CMakeLists.txt @@ -17,12 +17,10 @@ add_library(ERS_ProjectLoader # Link 3rd Party Libs target_link_libraries(ERS_ProjectLoader - yaml-cpp ) # Link Internal Libs target_link_libraries(ERS_ProjectLoader - ERS_STRUCT_IOData ERS_STRUCT_SystemUtils ERS_STRUCT_Project diff --git a/Source/Core/Loader/ERS_SceneLoader/CMakeLists.txt b/Source/Core/Loader/ERS_SceneLoader/CMakeLists.txt index 13f2d0cb16..502657b0a6 100644 --- a/Source/Core/Loader/ERS_SceneLoader/CMakeLists.txt +++ b/Source/Core/Loader/ERS_SceneLoader/CMakeLists.txt @@ -17,6 +17,7 @@ add_library(ERS_SceneLoader # Link 3rd Party Libs target_link_libraries(ERS_SceneLoader + yaml-cpp ) # Link Internal Libs diff --git a/Source/Core/Manager/ERS_ProjectManager/CMakeLists.txt b/Source/Core/Manager/ERS_ProjectManager/CMakeLists.txt index 31e8242143..86eadbf2a8 100644 --- a/Source/Core/Manager/ERS_ProjectManager/CMakeLists.txt +++ b/Source/Core/Manager/ERS_ProjectManager/CMakeLists.txt @@ -19,24 +19,18 @@ set_property(TARGET ERS_ProjectManager PROPERTY CXX_STANDARD 17) # Link 3rd Party Libs target_link_libraries(ERS_ProjectManager - glad - glfw ) # Link Internal Libs target_link_libraries(ERS_ProjectManager + ERS_STRUCT_SystemUtils + ERS_STRUCT_Project + ERS_SceneLoader + ERS_SceneManager ERS_ProjectLoader ERS_ProjectWriter - ERS_ControllerSettingsLoader - - ERS_SceneManager - ERS_SceneLoader - - ERS_STRUCT_SystemUtils - ERS_STRUCT_Project - ) target_include_directories(ERS_ProjectManager PUBLIC ./) diff --git a/Source/Core/Manager/ERS_SceneManager/CMakeLists.txt b/Source/Core/Manager/ERS_SceneManager/CMakeLists.txt index 72c08969b0..3a58403465 100644 --- a/Source/Core/Manager/ERS_SceneManager/CMakeLists.txt +++ b/Source/Core/Manager/ERS_SceneManager/CMakeLists.txt @@ -17,19 +17,17 @@ add_library(ERS_SceneManager # Link 3rd Party Libs target_link_libraries(ERS_SceneManager - yaml-cpp glm ) # Link Internal Libs target_link_libraries(ERS_SceneManager + ERS_CLASS_LoggingSystem + + ERS_STRUCT_Shader ERS_STRUCT_Scene ERS_STRUCT_LocRotScale - ERS_STRUCT_Shader - ERS_STRUCT_OpenGLDefaults - - ERS_CLASS_LoggingSystem - + ERS_STRUCT_OpenGLDefaults ) target_include_directories(ERS_SceneManager PUBLIC ./) \ No newline at end of file diff --git a/Source/Core/Renderer/ERS_CLASS_Framebuffer/CMakeLists.txt b/Source/Core/Renderer/ERS_CLASS_Framebuffer/CMakeLists.txt deleted file mode 100644 index 87b7fe9ae7..0000000000 --- a/Source/Core/Renderer/ERS_CLASS_Framebuffer/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -######################################################################## -# This file is part of the BrainGenix-ERS Environment Rendering System # -######################################################################## - - -# Create Library (Name Should Be Parent Dir Name) -add_library(ERS_CLASS_Framebuffer - - # Add Source Files (.cpp) - "ERS_CLASS_Framebuffer.cpp" - - # Add Header Files (.h) - "ERS_CLASS_Framebuffer.h" - - ${BACKWARD_ENABLE} - ) - -# Link 3rd Party Libs -target_link_libraries(ERS_CLASS_Framebuffer - glm - glad - glfw - IMGUI - ) - -# Link Internal Libs -target_link_libraries(ERS_CLASS_Framebuffer - ERS_CLASS_LoggingSystem - ERS_STRUCT_Shader - ERS_ShaderLoader - ) - -target_include_directories(ERS_CLASS_Framebuffer PUBLIC ./) diff --git a/Source/Core/Renderer/ERS_CLASS_InputProcessor/CMakeLists.txt b/Source/Core/Renderer/ERS_CLASS_InputProcessor/CMakeLists.txt deleted file mode 100644 index 31c6338867..0000000000 --- a/Source/Core/Renderer/ERS_CLASS_InputProcessor/CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -######################################################################## -# This file is part of the BrainGenix-ERS Environment Rendering System # -######################################################################## - - -# Create Library (Name Should Be Parent Dir Name) -add_library(ERS_CLASS_InputProcessor - - # Add Source Files (.cpp) - "ERS_CLASS_InputProcessor.cpp" - - # Add Header Files (.h) - "ERS_CLASS_InputProcessor.h" - - ${BACKWARD_ENABLE} - ) - -# Link 3rd Party Libs -target_link_libraries(ERS_CLASS_InputProcessor - yaml-cpp - glm - glad - glfw - IMGUI - ) - -# Link Internal Libs -target_link_libraries(ERS_CLASS_InputProcessor - ERS_STRUCT_Camera - ERS_CLASS_LoggingSystem - - ERS_STRUCT_Model - ERS_STRUCT_Scene - ERS_SceneManager - - VisualEditor - - ERS_STRUCT_Shader - ERS_ShaderLoader - ERS_CLASS_Framebuffer - - ERS_SceneLoader - ) - -target_include_directories(ERS_CLASS_InputProcessor PUBLIC ./) -