Update Soup

calamity-inc · Dec 9, 2023 · baa7eb9 · baa7eb9
1 parent d4e8d4d
commit baa7eb9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -49,15 +49,15 @@
 
 // === 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
 #endif
 
 // === 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