From 7f7153100bffe55a0a55acf9a210cd23d9e6e736 Mon Sep 17 00:00:00 2001 From: OLEGSHA Date: Mon, 7 Nov 2022 22:47:11 +0300 Subject: [PATCH] First improvements for Visual Studio / MSVC users - Added missing includes - -Werror, -Wextra and -Wpedantic are used with GCC only - CXX_STANDARD_REQUIRED is now ON --- CMakeLists.txt | 8 +++++++- desktop/graphics/vulkan_adapter.cpp | 1 + desktop/graphics/vulkan_uniform.h | 1 + main/game.cpp | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ea62d6..e4358c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,13 @@ endif() # Compilation settings set_property(TARGET progressia PROPERTY CXX_STANDARD 17) -target_compile_options(progressia PRIVATE -Wall -Wextra -Wpedantic -Werror) +set_property(TARGET progressia PROPERTY CXX_STANDARD_REQUIRED ON) +target_compile_options(progressia PRIVATE -Wall) + +# Extra options for gcc -- we're using this for extra static analisys for now +if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + target_compile_options(progressia PRIVATE -Wextra -Wpedantic -Werror) +endif() # Version information if (NOT DEFINED BUILD_ID) diff --git a/desktop/graphics/vulkan_adapter.cpp b/desktop/graphics/vulkan_adapter.cpp index 7b87212..db496a6 100644 --- a/desktop/graphics/vulkan_adapter.cpp +++ b/desktop/graphics/vulkan_adapter.cpp @@ -2,6 +2,7 @@ #include "vulkan_common.h" +#include #include #include #include diff --git a/desktop/graphics/vulkan_uniform.h b/desktop/graphics/vulkan_uniform.h index 91a8f8f..873e78f 100644 --- a/desktop/graphics/vulkan_uniform.h +++ b/desktop/graphics/vulkan_uniform.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include diff --git a/main/game.cpp b/main/game.cpp index 1cd42d6..b354bc5 100644 --- a/main/game.cpp +++ b/main/game.cpp @@ -1,5 +1,6 @@ #include "game.h" +#include #include #define GLM_FORCE_RADIANS