Requested Changes

- removal of GLM
- use defined cstring
- formatting on BuildEngine.ps1
- CMake Restructure for Vulkan headers and loader

Author: MathewBenson

CMakeLists.txt

@@ -63,5 +63,3 @@ add_subdirectory (Panzerfaust)
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 	set_property (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Panzerfaust)
 endif ()
-
-include(CPack)

CMakePresets.json

@@ -25,7 +25,6 @@
 
                 "GLFW_BUILD_DOCS": "OFF",
                 "GLFW_BUILD_EXAMPLES": "OFF",
-                "GLFW_BUILD_WAYLAND": "ON",
 
                 "ASSIMP_BUILD_TESTS": "OFF",
                 "ASSIMP_INSTALL": "OFF",

Scripts/BuildEngine.ps1

@@ -139,14 +139,15 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
 
         $buildProcess = Start-Process $cMakeProgram -ArgumentList $buildArguments -NoNewWindow -PassThru
 
-# Grab the process handle. When using `-NoNewWindow`, retrieving the ExitCode can return null once the process
-# has exited. See:
-# https://stackoverflow.com/questions/44057728/start-process-system-diagnostics-process-exitcode-is-null-with-nonewwindow
+    # Grab the process handle. When using `-NoNewWindow`, retrieving the ExitCode can return null once the process
+    # has exited. See: https://stackoverflow.com/questions/44057728/start-process-system-diagnostics-process-exitcode-is-null-with-nonewwindow
+
         $processHandle = $buildProcess.Handle
         $buildProcess.WaitForExit();
-    if ($buildProcess.ExitCode -ne 0) {
-        throw "cmake failed build for '$buildArguments' with exit code '$buildProcess.ExitCode'"
-    }
+        
+        if ($buildProcess.ExitCode -ne 0) {
+            throw "cmake failed build for '$buildArguments' with exit code '$buildProcess.ExitCode'"
+        }
 
         $install_directory =""
 

ZEngine/ZEngine/CMakeLists.txt

@@ -53,8 +53,6 @@ target_include_directories (zEngineLib
 
 target_precompile_headers(zEngineLib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pch.h)
 
-target_compile_definitions(zEngineLib PUBLIC GLM_ENABLE_EXPERIMENTAL)
-
 if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
 	target_compile_definitions (zEngineLib PUBLIC ENABLE_VULKAN_VALIDATION_LAYER)
 endif()

ZEngine/ZEngine/Rendering/Specifications/ShaderSpecification.h

@@ -1,4 +1,5 @@
 #pragma once
+#include <ZEngineDef.h>
 #include <vulkan/vulkan.h>
 
 namespace ZEngine::Rendering::Specifications
@@ -38,25 +39,25 @@ namespace ZEngine::Rendering::Specifications
         uint32_t         Set{0xFFFFFFFF};
         uint32_t         Binding{0xFFFFFFFF};
         uint32_t         Count{1};
-        const char*      Name;
+        cstring          Name;
         DescriptorType   DescriptorTypeValue;
         ShaderStageFlags Flags;
     };
 
     struct PushConstantSpecification
     {
-        const char*      Name;
+        cstring          Name;
         uint32_t         Size;
         uint32_t         Offset;
         ShaderStageFlags Flags;
     };
 
     struct ShaderSpecification
     {
-        uint32_t    OverloadMaxSet   = 1;
-        uint32_t    OverloadPoolSize = 0;
-        const char* VertexFilename   = {};
-        const char* FragmentFilename = {};
-        const char* Name             = {};
+        uint32_t OverloadMaxSet   = 1;
+        uint32_t OverloadPoolSize = 0;
+        cstring  VertexFilename   = {};
+        cstring  FragmentFilename = {};
+        cstring  Name             = {};
     };
 } // namespace ZEngine::Rendering::Specifications

dependencies.cmake

@@ -211,7 +211,7 @@ target_sources(
 
 target_compile_definitions(imgui PUBLIC GLFW_INCLUDE_VULKAN IMGUI_DEFINE_MATH_OPERATORS)
 
-target_link_libraries(imgui PUBLIC glfw Vulkan::Headers Vulkan::Loader)
+target_link_libraries(imgui PRIVATE glfw Vulkan::Headers Vulkan::Loader)
 
 add_library(imguizmo STATIC)
 
@@ -246,6 +246,9 @@ endif()
 
 target_link_libraries(External_libs
     INTERFACE
+         Vulkan::Headers
+         Vulkan::Loader
+         glfw
          fmt::fmt
          imguizmo
          spdlog::spdlog