From b787125d12fd81cb483f9c1bc7e3e8732158eb08 Mon Sep 17 00:00:00 2001 From: markszutor Date: Mon, 13 Jan 2025 19:54:19 +0200 Subject: [PATCH] build: bump fbw dev env --- CMakeLists-A21N.txt | 6 +++++- CMakeLists-A319.txt | 6 +++++- CMakeLists-A320.txt | 6 +++++- CMakeLists.txt | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/CMakeLists-A21N.txt b/CMakeLists-A21N.txt index 3022c6f1..958c8d96 100644 --- a/CMakeLists-A21N.txt +++ b/CMakeLists-A21N.txt @@ -10,7 +10,7 @@ set(FBW_COMMON ${FBW_ROOT}/fbw-common/src/wasm) include("${FBW_COMMON}/cpp-msfs-framework/cmake/TargetDefinition.cmake") # compiler refinement -set(COMPILER_FLAGS "-Wall -Wextra -Wno-unused-function -Wno-unused-command-line-argument -Wno-ignored-attributes -Wno-macro-redefined -target wasm32-unknown-wasi --sysroot \"${MSFS_SDK}/WASM/wasi-sysroot\" -mthread-model single -fno-exceptions -fms-extensions -fvisibility=hidden -ffunction-sections -fdata-sections -fno-stack-protector") +set(COMPILER_FLAGS "-Wall -Wextra -Wno-unused-function -Wno-unused-command-line-argument -Wno-ignored-attributes -Wno-macro-redefined -target wasm32-unknown-wasi --sysroot \"${MSFS_SDK}/WASM/wasi-sysroot\" -mthread-model single -fno-exceptions -fms-extensions -fvisibility=hidden -ffunction-sections -fdata-sections -Werror=return-type -fno-stack-protector -fstack-size-section -mbulk-memory") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMPILER_FLAGS}") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto -O2 -DNDEBUG") @@ -47,6 +47,10 @@ add_definitions( -DNO_EXAMPLES #PROFILING | NO_PROFILING - for logging of profiling information of pre-, post-, update() calls -DNO_PROFILING + # disable MSFS header min/max macros which clobber std::min/max + -DNOMINMAX + # MSFS stdlib uses 64-bit off_t for lseek etc. + -D_FILE_OFFSET_BITS=64 ) # add the common components diff --git a/CMakeLists-A319.txt b/CMakeLists-A319.txt index e6dae267..f93f8649 100644 --- a/CMakeLists-A319.txt +++ b/CMakeLists-A319.txt @@ -10,7 +10,7 @@ set(FBW_COMMON ${FBW_ROOT}/fbw-common/src/wasm) include("${FBW_COMMON}/cpp-msfs-framework/cmake/TargetDefinition.cmake") # compiler refinement -set(COMPILER_FLAGS "-Wall -Wextra -Wno-unused-function -Wno-unused-command-line-argument -Wno-ignored-attributes -Wno-macro-redefined -target wasm32-unknown-wasi --sysroot \"${MSFS_SDK}/WASM/wasi-sysroot\" -mthread-model single -fno-exceptions -fms-extensions -fvisibility=hidden -ffunction-sections -fdata-sections -fno-stack-protector") +set(COMPILER_FLAGS "-Wall -Wextra -Wno-unused-function -Wno-unused-command-line-argument -Wno-ignored-attributes -Wno-macro-redefined -target wasm32-unknown-wasi --sysroot \"${MSFS_SDK}/WASM/wasi-sysroot\" -mthread-model single -fno-exceptions -fms-extensions -fvisibility=hidden -ffunction-sections -fdata-sections -Werror=return-type -fno-stack-protector -fstack-size-section -mbulk-memory") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMPILER_FLAGS}") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto -O2 -DNDEBUG") @@ -47,6 +47,10 @@ add_definitions( -DNO_EXAMPLES #PROFILING | NO_PROFILING - for logging of profiling information of pre-, post-, update() calls -DNO_PROFILING + # disable MSFS header min/max macros which clobber std::min/max + -DNOMINMAX + # MSFS stdlib uses 64-bit off_t for lseek etc. + -D_FILE_OFFSET_BITS=64 ) # add the common components diff --git a/CMakeLists-A320.txt b/CMakeLists-A320.txt index 17014e35..1bee6b50 100644 --- a/CMakeLists-A320.txt +++ b/CMakeLists-A320.txt @@ -10,7 +10,7 @@ set(FBW_COMMON ${FBW_ROOT}/fbw-common/src/wasm) include("${FBW_COMMON}/cpp-msfs-framework/cmake/TargetDefinition.cmake") # compiler refinement -set(COMPILER_FLAGS "-Wall -Wextra -Wno-unused-function -Wno-unused-command-line-argument -Wno-ignored-attributes -Wno-macro-redefined -target wasm32-unknown-wasi --sysroot \"${MSFS_SDK}/WASM/wasi-sysroot\" -mthread-model single -fno-exceptions -fms-extensions -fvisibility=hidden -ffunction-sections -fdata-sections -fno-stack-protector") +set(COMPILER_FLAGS "-Wall -Wextra -Wno-unused-function -Wno-unused-command-line-argument -Wno-ignored-attributes -Wno-macro-redefined -target wasm32-unknown-wasi --sysroot \"${MSFS_SDK}/WASM/wasi-sysroot\" -mthread-model single -fno-exceptions -fms-extensions -fvisibility=hidden -ffunction-sections -fdata-sections -Werror=return-type -fno-stack-protector -fstack-size-section -mbulk-memory") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMPILER_FLAGS}") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto -O2 -DNDEBUG") @@ -47,6 +47,10 @@ add_definitions( -DNO_EXAMPLES #PROFILING | NO_PROFILING - for logging of profiling information of pre-, post-, update() calls -DNO_PROFILING + # disable MSFS header min/max macros which clobber std::min/max + -DNOMINMAX + # MSFS stdlib uses 64-bit off_t for lseek etc. + -D_FILE_OFFSET_BITS=64 ) # add the common components diff --git a/CMakeLists.txt b/CMakeLists.txt index 3022c6f1..958c8d96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(FBW_COMMON ${FBW_ROOT}/fbw-common/src/wasm) include("${FBW_COMMON}/cpp-msfs-framework/cmake/TargetDefinition.cmake") # compiler refinement -set(COMPILER_FLAGS "-Wall -Wextra -Wno-unused-function -Wno-unused-command-line-argument -Wno-ignored-attributes -Wno-macro-redefined -target wasm32-unknown-wasi --sysroot \"${MSFS_SDK}/WASM/wasi-sysroot\" -mthread-model single -fno-exceptions -fms-extensions -fvisibility=hidden -ffunction-sections -fdata-sections -fno-stack-protector") +set(COMPILER_FLAGS "-Wall -Wextra -Wno-unused-function -Wno-unused-command-line-argument -Wno-ignored-attributes -Wno-macro-redefined -target wasm32-unknown-wasi --sysroot \"${MSFS_SDK}/WASM/wasi-sysroot\" -mthread-model single -fno-exceptions -fms-extensions -fvisibility=hidden -ffunction-sections -fdata-sections -Werror=return-type -fno-stack-protector -fstack-size-section -mbulk-memory") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMPILER_FLAGS}") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto -O2 -DNDEBUG") @@ -47,6 +47,10 @@ add_definitions( -DNO_EXAMPLES #PROFILING | NO_PROFILING - for logging of profiling information of pre-, post-, update() calls -DNO_PROFILING + # disable MSFS header min/max macros which clobber std::min/max + -DNOMINMAX + # MSFS stdlib uses 64-bit off_t for lseek etc. + -D_FILE_OFFSET_BITS=64 ) # add the common components