From 17359be58a11ba19d56e8ce4b40a244355c3fcb3 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Sun, 24 Nov 2024 14:16:48 +0100 Subject: [PATCH] build: Fixed remaining build issues --- cmake/build_helpers.cmake | 6 +++--- lib/external/libwolv | 2 +- lib/libimhex/include/hex/helpers/types.hpp | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index a4a3b5ad4..81d5d4eac 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -307,9 +307,6 @@ endfunction() macro(configureCMake) message(STATUS "Configuring ImHex v${IMHEX_VERSION}") - # Enable C and C++ languages - enable_language(C CXX) - set(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL "Enable position independent code for all targets" FORCE) # Configure use of recommended build tools @@ -383,6 +380,9 @@ macro(configureCMake) endmacro() function(configureProject) + # Enable C and C++ languages + enable_language(C CXX) + if (XCODE) # Support Xcode's multi configuration paradigm by placing built artifacts into separate directories set(IMHEX_MAIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Configs/$" PARENT_SCOPE) diff --git a/lib/external/libwolv b/lib/external/libwolv index f82c71855..eb826d70d 160000 --- a/lib/external/libwolv +++ b/lib/external/libwolv @@ -1 +1 @@ -Subproject commit f82c7185519219a3462f3f8667f431b3b8093339 +Subproject commit eb826d70d32fc5dd27541514cc56dc741d94416a diff --git a/lib/libimhex/include/hex/helpers/types.hpp b/lib/libimhex/include/hex/helpers/types.hpp index e8eed5399..88f0d6c3c 100644 --- a/lib/libimhex/include/hex/helpers/types.hpp +++ b/lib/libimhex/include/hex/helpers/types.hpp @@ -4,6 +4,7 @@ #include #include +#include using u8 = std::uint8_t; using u16 = std::uint16_t;