diff options
| author | crueter <crueter@eden-emu.dev> | 2026-02-02 06:12:36 +0100 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2026-02-02 06:12:36 +0100 |
| commit | ecbfad4193a176d88c9d1dc548216834f154f911 (patch) | |
| tree | 42b60e5e70a3627a100dbdc7100d68c0880edb02 /.patch | |
| parent | d76b2b5d266895cf1dd35da5449b34b22bb84656 (diff) | |
[externals] Update Boost to 1.90.0 (#3448)
Removes the need for those MSVC/ARM patches
Signed-off-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3448
Reviewed-by: DraVee <dravee@eden-emu.dev>
Reviewed-by: Lizzie <lizzie@eden-emu.dev>
Diffstat (limited to '.patch')
| -rw-r--r-- | .patch/boost/0002-use-marmasm.patch | 11 | ||||
| -rw-r--r-- | .patch/boost/0003-armasm-options.patch | 14 |
2 files changed, 0 insertions, 25 deletions
diff --git a/.patch/boost/0002-use-marmasm.patch b/.patch/boost/0002-use-marmasm.patch deleted file mode 100644 index 10f490b878..0000000000 --- a/.patch/boost/0002-use-marmasm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libs/context/CMakeLists.txt 2025-09-08 00:42:31.303651800 -0400 -+++ b/libs/context/CMakeLists.txt 2025-09-08 00:42:40.592184300 -0400 -@@ -146,7 +146,7 @@ - set(ASM_LANGUAGE ASM) - endif() - elseif(BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) -- set(ASM_LANGUAGE ASM_ARMASM) -+ set(ASM_LANGUAGE ASM_MARMASM) - else() - set(ASM_LANGUAGE ASM_MASM) - endif() diff --git a/.patch/boost/0003-armasm-options.patch b/.patch/boost/0003-armasm-options.patch deleted file mode 100644 index 3869f95f6f..0000000000 --- a/.patch/boost/0003-armasm-options.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libs/context/CMakeLists.txt b/libs/context/CMakeLists.txt -index 8210f65..0e59dd7 100644 ---- a/libs/context/CMakeLists.txt -+++ b/libs/context/CMakeLists.txt -@@ -186,7 +186,8 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext") - set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/safeseh") - endif() - -- else() # masm -+ # armasm doesn't support most of these options -+ elseif(NOT BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) # masm - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp") - elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") |