From 8406239d857d8d3b57349f77eeb348a007321026 Mon Sep 17 00:00:00 2001 From: irisz64 Date: Fri, 25 Jul 2025 15:43:57 +0200 Subject: [PATCH] Solve warnings (at least those under my control) --- CMakeLists.txt | 6 ++++-- .../parallel-rdp-standalone/parallel-rdp/rdp_renderer.cpp | 2 +- .../parallel-rdp/video_interface.cpp | 2 +- .../parallel-rdp-standalone/vulkan/buffer_pool.cpp | 2 +- .../parallel-rdp-standalone/vulkan/command_buffer.cpp | 2 +- .../parallel-rdp/parallel-rdp-standalone/vulkan/context.cpp | 2 +- .../parallel-rdp-standalone/vulkan/descriptor_set.cpp | 2 +- .../parallel-rdp/parallel-rdp-standalone/vulkan/device.cpp | 2 +- .../parallel-rdp-standalone/vulkan/render_pass.cpp | 2 +- .../parallel-rdp/parallel-rdp-standalone/vulkan/shader.cpp | 2 +- .../vulkan/texture/texture_format.cpp | 2 +- .../parallel-rdp/parallel-rdp-standalone/vulkan/wsi.cpp | 2 +- resources/gamecontrollerdb.h | 2 +- 13 files changed, 16 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c2bedc3e..a814702d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,9 @@ endif() set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) +if(${CMAKE_BUILD_TYPE} MATCHES Release OR ${CMAKE_BUILD_TYPE} MATCHES RelWithDebInfo) + set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) +endif() include_directories( src/frontend @@ -131,7 +133,7 @@ add_executable(kaizen src/frontend/Debugger.hpp src/frontend/Debugger.cpp) -target_link_libraries(kaizen PUBLIC imgui SDL3::SDL3 SDL3::SDL3-static cflags::cflags mio parallel-rdp capstone backend) +target_link_libraries(kaizen PUBLIC imgui SDL3::SDL3 SDL3::SDL3-static cflags::cflags mio::mio_full_winapi parallel-rdp capstone backend) target_compile_definitions(kaizen PUBLIC SDL_MAIN_HANDLED) file(COPY resources/ DESTINATION ${PROJECT_BINARY_DIR}/resources/) diff --git a/external/parallel-rdp/parallel-rdp-standalone/parallel-rdp/rdp_renderer.cpp b/external/parallel-rdp/parallel-rdp-standalone/parallel-rdp/rdp_renderer.cpp index ec822b55..a9c66423 100644 --- a/external/parallel-rdp/parallel-rdp-standalone/parallel-rdp/rdp_renderer.cpp +++ b/external/parallel-rdp/parallel-rdp-standalone/parallel-rdp/rdp_renderer.cpp @@ -20,7 +20,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#define NOMINMAX + #include "rdp_renderer.hpp" #include "rdp_device.hpp" #include "logging.hpp" diff --git a/external/parallel-rdp/parallel-rdp-standalone/parallel-rdp/video_interface.cpp b/external/parallel-rdp/parallel-rdp-standalone/parallel-rdp/video_interface.cpp index e401067e..0becc4ac 100644 --- a/external/parallel-rdp/parallel-rdp-standalone/parallel-rdp/video_interface.cpp +++ b/external/parallel-rdp/parallel-rdp-standalone/parallel-rdp/video_interface.cpp @@ -20,7 +20,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#define NOMINMAX + #include "video_interface.hpp" #include "rdp_renderer.hpp" #include "luts.hpp" diff --git a/external/parallel-rdp/parallel-rdp-standalone/vulkan/buffer_pool.cpp b/external/parallel-rdp/parallel-rdp-standalone/vulkan/buffer_pool.cpp index 84359697..9a500eff 100644 --- a/external/parallel-rdp/parallel-rdp-standalone/vulkan/buffer_pool.cpp +++ b/external/parallel-rdp/parallel-rdp-standalone/vulkan/buffer_pool.cpp @@ -20,7 +20,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#define NOMINMAX + #include "buffer_pool.hpp" #include "device.hpp" #include diff --git a/external/parallel-rdp/parallel-rdp-standalone/vulkan/command_buffer.cpp b/external/parallel-rdp/parallel-rdp-standalone/vulkan/command_buffer.cpp index 2535abec..d62f723d 100644 --- a/external/parallel-rdp/parallel-rdp-standalone/vulkan/command_buffer.cpp +++ b/external/parallel-rdp/parallel-rdp-standalone/vulkan/command_buffer.cpp @@ -20,7 +20,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#define NOMINMAX + #include "command_buffer.hpp" #include "device.hpp" #include "format.hpp" diff --git a/external/parallel-rdp/parallel-rdp-standalone/vulkan/context.cpp b/external/parallel-rdp/parallel-rdp-standalone/vulkan/context.cpp index a9a07a25..f6a0c89d 100644 --- a/external/parallel-rdp/parallel-rdp-standalone/vulkan/context.cpp +++ b/external/parallel-rdp/parallel-rdp-standalone/vulkan/context.cpp @@ -20,7 +20,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#define NOMINMAX + #include "context.hpp" #include "limits.hpp" #include "small_vector.hpp" diff --git a/external/parallel-rdp/parallel-rdp-standalone/vulkan/descriptor_set.cpp b/external/parallel-rdp/parallel-rdp-standalone/vulkan/descriptor_set.cpp index cca2ff74..b661aeb2 100644 --- a/external/parallel-rdp/parallel-rdp-standalone/vulkan/descriptor_set.cpp +++ b/external/parallel-rdp/parallel-rdp-standalone/vulkan/descriptor_set.cpp @@ -20,7 +20,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#define NOMINMAX + #include "descriptor_set.hpp" #include "device.hpp" #include diff --git a/external/parallel-rdp/parallel-rdp-standalone/vulkan/device.cpp b/external/parallel-rdp/parallel-rdp-standalone/vulkan/device.cpp index 6623a9dd..3e6b5f54 100644 --- a/external/parallel-rdp/parallel-rdp-standalone/vulkan/device.cpp +++ b/external/parallel-rdp/parallel-rdp-standalone/vulkan/device.cpp @@ -20,7 +20,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#define NOMINMAX + #include "device.hpp" #ifdef GRANITE_VULKAN_FOSSILIZE #include "device_fossilize.hpp" diff --git a/external/parallel-rdp/parallel-rdp-standalone/vulkan/render_pass.cpp b/external/parallel-rdp/parallel-rdp-standalone/vulkan/render_pass.cpp index eff19aec..4fff4d52 100644 --- a/external/parallel-rdp/parallel-rdp-standalone/vulkan/render_pass.cpp +++ b/external/parallel-rdp/parallel-rdp-standalone/vulkan/render_pass.cpp @@ -20,7 +20,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#define NOMINMAX + #include "render_pass.hpp" #include "stack_allocator.hpp" #include "device.hpp" diff --git a/external/parallel-rdp/parallel-rdp-standalone/vulkan/shader.cpp b/external/parallel-rdp/parallel-rdp-standalone/vulkan/shader.cpp index 15d2e3a4..b4672c97 100644 --- a/external/parallel-rdp/parallel-rdp-standalone/vulkan/shader.cpp +++ b/external/parallel-rdp/parallel-rdp-standalone/vulkan/shader.cpp @@ -20,7 +20,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#define NOMINMAX + #include "shader.hpp" #include "device.hpp" #ifdef GRANITE_VULKAN_SPIRV_CROSS diff --git a/external/parallel-rdp/parallel-rdp-standalone/vulkan/texture/texture_format.cpp b/external/parallel-rdp/parallel-rdp-standalone/vulkan/texture/texture_format.cpp index fc9e95e8..f0c899ca 100644 --- a/external/parallel-rdp/parallel-rdp-standalone/vulkan/texture/texture_format.cpp +++ b/external/parallel-rdp/parallel-rdp-standalone/vulkan/texture/texture_format.cpp @@ -20,7 +20,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#define NOMINMAX + #include "texture_format.hpp" #include "format.hpp" #include diff --git a/external/parallel-rdp/parallel-rdp-standalone/vulkan/wsi.cpp b/external/parallel-rdp/parallel-rdp-standalone/vulkan/wsi.cpp index 5d44f19d..32572b6b 100644 --- a/external/parallel-rdp/parallel-rdp-standalone/vulkan/wsi.cpp +++ b/external/parallel-rdp/parallel-rdp-standalone/vulkan/wsi.cpp @@ -20,7 +20,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#define NOMINMAX + #include "wsi.hpp" #include "environment.hpp" #include diff --git a/resources/gamecontrollerdb.h b/resources/gamecontrollerdb.h index 5d25291e..c75237a0 100644 --- a/resources/gamecontrollerdb.h +++ b/resources/gamecontrollerdb.h @@ -1,4 +1,4 @@ -constexpr char* gamecontrollerdb_str = R"( +char const* gamecontrollerdb_str = R"( # Game Controller DB for SDL in 2.0.16 format # Source: https://github.com/gabomdq/SDL_GameControllerDB