Fix definition errors

Hjaltesorgenfrei · Feb 16, 2023 · 59a10a8 · 59a10a8
1 parent 0eb0167
commit 59a10a8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -87,7 +87,7 @@ add_executable(vulkanologi
 
 add_compile_definitions(VULKAN_HPP_NO_STRUCT_CONSTRUCTORS) # Version 145 at least
 target_precompile_headers(vulkanologi PRIVATE ${Vulkan_INCLUDE_DIRS}/vulkan/vulkan.hpp ext/glm/glm/glm.hpp)
-target_precompile_headers(vulkanologi PRIVATE src/BehDevice.h)
+target_precompile_headers(vulkanologi PRIVATE src/BehDevice.h src/WindowWrapper.h)
 
 target_link_libraries(vulkanologi glfw glm tinyobjloader VulkanMemoryAllocator Vulkan::Vulkan)
 add_shader(vulkanologi shader.frag)

diff --git a/src/BehDevice.h b/src/BehDevice.h
@@ -1,13 +1,17 @@
-#pragma once
+#ifndef BEHDEVICE_H
+#define BEHDEVICE_H
+#pragma once
 
 #include "WindowWrapper.h"
+#include "BehVkTypes.h"
+#include "Deletionqueue.h"
 #include <vulkan/vulkan.hpp>
 #include <iostream>
 #include <map>
 #include <optional>
 #include <set>
-#include "BehVkTypes.h"
-#include "Deletionqueue.h"
+#include <memory>
+
 
 #ifdef NDEBUG
 const bool enableValidationLayers = false;
@@ -117,3 +121,5 @@ class BehDevice {
     const std::vector<const char*> deviceExtensions = {
             VK_KHR_SWAPCHAIN_EXTENSION_NAME};
 };
+
+#endif
diff --git a/src/WindowWrapper.h b/src/WindowWrapper.h
@@ -1,4 +1,7 @@
-#pragma once
+#ifndef WINDOWWRAPPER_H
+#define WINDOWWRAPPER_H
+#pragma once
+
 #include <utility>
 
 #define GLFW_INCLUDE_VULKAN
@@ -22,3 +25,5 @@ class WindowWrapper {
 	[[nodiscard]] bool isFullScreen();
 	void setTitle(const char* title);
 };
+
+#endif