Archived
1
Fork 0

Fix windows build

This commit is contained in:
redstrate 2020-09-23 08:44:14 -04:00
parent b5ae6c87de
commit 96758b8b3e
6 changed files with 10 additions and 3 deletions

View file

@ -2,7 +2,7 @@ macro(set_engine_properties target)
target_compile_features(${target} PUBLIC cxx_std_17) target_compile_features(${target} PUBLIC cxx_std_17)
set_target_properties(${target} PROPERTIES CXX_EXTENSIONS OFF) set_target_properties(${target} PROPERTIES CXX_EXTENSIONS OFF)
if(NOT ENABLE_WINDOWS) if(ENABLE_MACOS OR ENABLE_LINUX)
target_compile_options(${target} PUBLIC target_compile_options(${target} PUBLIC
-Wall -Wall
-Wextra -Wextra

View file

@ -2,6 +2,7 @@
#include <unordered_map> #include <unordered_map>
#include <nlohmann/json_fwd.hpp> #include <nlohmann/json_fwd.hpp>
#include <functional>
#include "object.hpp" #include "object.hpp"
#include "components.hpp" #include "components.hpp"

View file

@ -2,6 +2,7 @@
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
#include <optional>
#include "log.hpp" #include "log.hpp"
#include "string_utils.hpp" #include "string_utils.hpp"

View file

@ -48,4 +48,5 @@ file::Path parent_domain(const file::Path path) {
file::Path file::get_relative_path(const Domain domain, const Path path) { file::Path file::get_relative_path(const Domain domain, const Path path) {
// unimplemented // unimplemented
return path;
} }

View file

@ -875,9 +875,9 @@ void GFXVulkan::submit(GFXCommandBuffer* command_buffer, const int identifier) {
vkCmdBeginRenderPass(commandBuffers[imageIndex], &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE); vkCmdBeginRenderPass(commandBuffers[imageIndex], &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
} }
break; 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); vkCmdBindPipeline(commandBuffers[imageIndex], VK_PIPELINE_BIND_POINT_GRAPHICS, currentPipeline->handle);
resetDescriptorState(); resetDescriptorState();

View file

@ -89,4 +89,8 @@ void platform::mute_output() {
void platform::unmute_output() { void platform::unmute_output() {
}
PlatformTheme platform::get_theme() {
return PlatformTheme::Light;
} }