From baa7eb987a750955bfe1164b2bd8c96fe44cfbbb Mon Sep 17 00:00:00 2001 From: Sainan Date: Sat, 9 Dec 2023 13:40:37 +0100 Subject: [PATCH] Update Soup --- Sun/vendor/Soup/soup/Compiler.cpp | 4 ++++ Sun/vendor/Soup/soup/base.hpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Sun/vendor/Soup/soup/Compiler.cpp b/Sun/vendor/Soup/soup/Compiler.cpp index f647190..42baa16 100644 --- a/Sun/vendor/Soup/soup/Compiler.cpp +++ b/Sun/vendor/Soup/soup/Compiler.cpp @@ -52,11 +52,15 @@ namespace soup args.emplace_back("-lgdi32"); } #else +#if !SOUP_MACOS args.emplace_back("-fuse-ld=lld"); +#endif args.emplace_back("-lstdc++"); if (!isEmscripten()) { +#if !SOUP_MACOS args.emplace_back("-lstdc++fs"); +#endif args.emplace_back("-lresolv"); } args.emplace_back("-lm"); diff --git a/Sun/vendor/Soup/soup/base.hpp b/Sun/vendor/Soup/soup/base.hpp index e4d462f..d410f92 100644 --- a/Sun/vendor/Soup/soup/base.hpp +++ b/Sun/vendor/Soup/soup/base.hpp @@ -49,7 +49,7 @@ // === Determine CPU register size -#if defined(__x86_64__) || defined(__ppc64__) || defined(_M_X64) || defined(__aarch64__) +#if defined(__x86_64__) || defined(_M_X64) || defined(__ppc64__) || defined(__aarch64__) #define SOUP_BITS 64 #else #define SOUP_BITS 32 @@ -57,7 +57,7 @@ // === Determine CPU architecture -#if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined(__i386) || defined(__i486__) || defined(__i486) || defined(i386) || defined(__ia64__) || defined(__x86_64__) +#if defined(__x86_64__) || defined(_M_X64) || defined(i386) || defined(__i386__) || defined(__i386) || defined(_M_IX86) #define SOUP_X86 true #else #define SOUP_X86 false