carboncopies · datacrystals · Jun 29, 2022 · Jun 28, 2022 · Jun 28, 2022 · Jun 28, 2022
diff --git 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
@@ -12,13 +12,11 @@
 #include <GLFW/glfw3.h>
 
 #include <imgui.h>
-
-#include <implot.h>
-
-
 #include <backends/imgui_impl_glfw.h>
 #include <backends/imgui_impl_opengl3.h>
 
+#include <implot.h>
+
 #include <ImGuizmo.h>
 
 // Internal Libraries (BG convention: use <> instead of "")
@@ -29,12 +27,12 @@
 #include <ERS_STRUCT_ProjectUtils.h>
 #include <ERS_STRUCT_HumanInputDeviceUtils.h>
 
-#include <ERS_Editor_FontManager.h>
 #include <ERS_Editor_ThemeManager.h>
+#include <ERS_Editor_FontManager.h>
 #include <ERS_Editor_UserProfileManager.h>
+#include <ERS_Editor_3DCursor.h>
 
 #include <ERS_SceneManager.h>
-#include <ERS_Editor_3DCursor.h>
 
 #include <GUI_Menu_File.h>
 #include <GUI_Menu_View.h>

diff --git 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
@@ -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
@@ -22,10 +22,10 @@
 #include <ERS_CLASS_LoggingSystem.h>
 #include <ERS_STRUCT_SystemUtils.h>
 #include <ERS_STRUCT_ProjectUtils.h>
-#include <ERS_ProjectLoader.h>
 
 #include <GUI_ImportAsset.h>
 
+#include <ERS_ProjectLoader.h>
 #include <ERS_SceneWriter.h>
 #include <ERS_SceneManager.h>
 

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
@@ -24,15 +24,24 @@ 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
 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
@@ -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
@@ -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
@@ -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
@@ -21,20 +21,20 @@
 #include <ERS_STRUCT_SystemUtils.h>
 #include <ERS_STRUCT_ProjectUtils.h>
 
-#include <GUI_Window_FramerateCounter.h>
-#include <GUI_Window_RenderingSettings.h>
-#include <GUI_Window_FramerateHistogram.h>
-#include <GUI_Window_FramerateGraph.h>
-#include <GUI_Window_FrameratePlot.h>
-#include <GUI_Window_FrameLatencyGraph.h>
-#include <GUI_Window_ObjectProperties.h>
-#include <GUI_Window_RAMGraph.h>
-
 #include <GUI_Window_SceneTree.h>
 #include <GUI_Window_SystemLog.h>
 #include <GUI_Window_AssetExplorer.h>
 #include <GUI_Window_ScriptEditor.h>
 
+#include <GUI_Window_RenderingSettings.h>
+#include <GUI_Window_RAMGraph.h>
+#include <GUI_Window_ObjectProperties.h>
+#include <GUI_Window_FramerateGraph.h>
+#include <GUI_Window_FrameLatencyGraph.h>
+#include <GUI_Window_FramerateCounter.h>
+#include <GUI_Window_FramerateHistogram.h>
+#include <GUI_Window_FrameratePlot.h>
+
 #include <ERS_Editor_3DCursor.h>
 #include <ERS_SceneManager.h>
 

diff --git a/Source/Core/Editor/Utils/ERS_Editor_3DCursor/CMakeLists.txt b/Source/Core/Editor/Utils/ERS_Editor_3DCursor/CMakeLists.txt
@@ -18,15 +18,14 @@ add_library(ERS_Editor_3DCursor
 # Link 3rd Party Libs
 target_link_libraries(ERS_Editor_3DCursor
     glm
-    glad
-    glfw
     IMGUI
     ImGuizmo
     )
 
 # 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
@@ -21,6 +21,7 @@
 
 // Internal Libraries (BG convention: use <> instead of "")
 #include <ERS_CLASS_LoggingSystem.h>
+
 #include <ERS_STRUCT_Camera.h>
 #include <ERS_STRUCT_LocRotScale.h>
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 ./)
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,8 +17,6 @@ add_library(Menu_Settings @@
     # Link 3rd Party Libs
     target_link_libraries(Menu_Settings
-        glad
-        glfw
         IMGUI
         )
@@ Expand Down @@