From 96758b8b3ea824a0d21f2135f212e912d2a4049e Mon Sep 17 00:00:00 2001
From: redstrate <54911369+redstrate@users.noreply.github.com>
Date: Wed, 23 Sep 2020 08:44:14 -0400
Subject: [PATCH] Fix windows build

---
 cmake/Common.cmake                   | 2 +-
 engine/core/include/scene.hpp        | 1 +
 engine/core/src/console.cpp          | 1 +
 engine/core/src/file.cpp             | 1 +
 engine/gfx/vulkan/src/gfx_vulkan.cpp | 4 ++--
 platforms/windows/windows.cpp        | 4 ++++
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cmake/Common.cmake b/cmake/Common.cmake
index 2f65385..8b64726 100755
--- a/cmake/Common.cmake
+++ b/cmake/Common.cmake
@@ -2,7 +2,7 @@ macro(set_engine_properties target)
     target_compile_features(${target} PUBLIC cxx_std_17)
     set_target_properties(${target} PROPERTIES CXX_EXTENSIONS OFF)
 
-    if(NOT ENABLE_WINDOWS)
+    if(ENABLE_MACOS OR ENABLE_LINUX)
         target_compile_options(${target} PUBLIC
             -Wall
             -Wextra
diff --git a/engine/core/include/scene.hpp b/engine/core/include/scene.hpp
index 0350723..c5a41be 100755
--- a/engine/core/include/scene.hpp
+++ b/engine/core/include/scene.hpp
@@ -2,6 +2,7 @@
 
 #include <unordered_map>
 #include <nlohmann/json_fwd.hpp>
+#include <functional>
 
 #include "object.hpp"
 #include "components.hpp"
diff --git a/engine/core/src/console.cpp b/engine/core/src/console.cpp
index 7b5af34..35875a8 100644
--- a/engine/core/src/console.cpp
+++ b/engine/core/src/console.cpp
@@ -2,6 +2,7 @@
 
 #include <unordered_map>
 #include <string>
+#include <optional>
 
 #include "log.hpp"
 #include "string_utils.hpp"
diff --git a/engine/core/src/file.cpp b/engine/core/src/file.cpp
index d516dc3..72e05c7 100755
--- a/engine/core/src/file.cpp
+++ b/engine/core/src/file.cpp
@@ -48,4 +48,5 @@ file::Path parent_domain(const file::Path path) {
 
 file::Path file::get_relative_path(const Domain domain, const Path path) {
     // unimplemented
+    return path;
 }
diff --git a/engine/gfx/vulkan/src/gfx_vulkan.cpp b/engine/gfx/vulkan/src/gfx_vulkan.cpp
index ec24176..dfcff89 100755
--- a/engine/gfx/vulkan/src/gfx_vulkan.cpp
+++ b/engine/gfx/vulkan/src/gfx_vulkan.cpp
@@ -875,9 +875,9 @@ void GFXVulkan::submit(GFXCommandBuffer* command_buffer, const int identifier) {
 			vkCmdBeginRenderPass(commandBuffers[imageIndex], &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
 		}
 		break;
-		case GFXCommandType::SetPipeline:
+		case GFXCommandType::SetGraphicsPipeline:
 		{
-			currentPipeline = (GFXVulkanPipeline*)command.data.set_pipeline.pipeline;
+			currentPipeline = (GFXVulkanPipeline*)command.data.set_graphics_pipeline.pipeline;
 			vkCmdBindPipeline(commandBuffers[imageIndex], VK_PIPELINE_BIND_POINT_GRAPHICS, currentPipeline->handle);
 
 			resetDescriptorState();
diff --git a/platforms/windows/windows.cpp b/platforms/windows/windows.cpp
index 7e6659c..d9c3926 100755
--- a/platforms/windows/windows.cpp
+++ b/platforms/windows/windows.cpp
@@ -89,4 +89,8 @@ void platform::mute_output() {
 
 void platform::unmute_output() {
 
+}
+
+PlatformTheme platform::get_theme() {
+	return PlatformTheme::Light;
 }
\ No newline at end of file