From 98f16c2c763a48824e6fddec4cb1ee68e67b4411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Fri, 22 Oct 2021 00:08:58 +0200 Subject: Further minor improvements to cross-compilation --- CMakeLists.txt | 2 +- Win64Depends.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab3e04b..5f7726a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ if (WIN32) set (WIN32_DEPENDS_PATH ${PROJECT_SOURCE_DIR}/win32-depends) list (APPEND CMAKE_PREFIX_PATH ${WIN32_DEPENDS_PATH}) list (APPEND CMAKE_INCLUDE_PATH ${WIN32_DEPENDS_PATH}/lib) - list (APPEND CMAKE_C_FLAGS "-mms-bitfields") + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mms-bitfields") if (CMAKE_CROSSCOMPILING) list (APPEND CMAKE_FIND_ROOT_PATH ${WIN32_DEPENDS_PATH}) diff --git a/Win64Depends.sh b/Win64Depends.sh index 98b64a9..2176eae 100644 --- a/Win64Depends.sh +++ b/Win64Depends.sh @@ -56,7 +56,7 @@ configure() { > lib/gdk-pixbuf-2.0/2.10.0/loaders.cache # pkgconf has a command line option for this, but CMake can't pass it - sed -i "s|^prefix=/mingw64|prefix=$(pwd)|" lib/pkgconfig/*.pc + sed -i "s|^prefix=/mingw64|prefix=$(pwd)|" {share,lib}/pkgconfig/*.pc } mkdir -p win32-depends -- cgit v1.2.3