Fix macOS build.

alliedmodders · Nov 5, 2023 · f4cef31 · f4cef31
1 parent 032a9ac
commit f4cef31
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 40 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/AMBuildScript b/AMBuildScript
@@ -107,10 +107,7 @@ class Config(object):
             if cxx.target.platform == 'linux':
                 cxx.postlink += ['-lpthread', '-lrt']
             elif cxx.target.platform == 'mac':
-                cxx.linkflags.remove('-lstdc++')
                 cxx.cflags += ['-mmacosx-version-min=10.15']
-                cxx.cflags += ['-stdlib=libc++']
-                cxx.linkflags += ['-stdlib=libc++']
                 cxx.linkflags += ['-mmacosx-version-min=10.15']
             elif cxx.target.platform == 'windows':
                 cxx.defines += ['WIN32', '_WINDOWS']
@@ -144,7 +141,6 @@ class Config(object):
             '-Wno-switch',
         ]
         cxx.cxxflags += ['-std=c++17']
-        cxx.linkflags += ['-lstdc++']
 
         if builder.options.debug == '1':
             cxx.cflags += ['-g3']

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/compiler/sci18n.cpp b/compiler/sci18n.cpp
@@ -48,6 +48,13 @@
 #include "errors.h"
 #include "sc.h"
 
+#define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
+
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 void UnicodeCodepointToUtf8(ucell codepoint, std::string* out) {
 #if defined(_MSC_VER) && _MSC_VER >= 1900 && _MSC_VER < 2000
     std::wstring_convert<std::codecvt_utf8<__int32>, __int32> convert;
@@ -59,3 +66,7 @@ void UnicodeCodepointToUtf8(ucell codepoint, std::string* out) {
 
     *out += convert.to_bytes(&cp, &cp + 1);
 }
+
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif