diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-15 17:33:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 17:33:06 +0200 |
| commit | 1efe7093bec9c0bfaa2ecedd9d5777b594d7283a (patch) | |
| tree | 72607a5938fa106e90ef835784ee48df1e73732f /platform | |
| parent | 3f888966c0311a49541d6eb952b5a76d105f59d5 (diff) | |
| parent | ae74e78909ae0bc476112fb43b9580e969879dcd (diff) | |
Merge pull request #53833 from akien-mga/remove-webm-support
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/linuxbsd/detect.py | 7 | ||||
| -rw-r--r-- | platform/osx/detect.py | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index 8e0adc079b..1b9dd1e8f3 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -288,17 +288,10 @@ def configure(env): if any(platform.machine() in s for s in list_of_x86): env["x86_libtheora_opt_gcc"] = True - if not env["builtin_libvpx"]: - env.ParseConfig("pkg-config vpx --cflags --libs") - if not env["builtin_libvorbis"]: env["builtin_libogg"] = False # Needed to link against system libvorbis env.ParseConfig("pkg-config vorbis vorbisfile --cflags --libs") - if not env["builtin_opus"]: - env["builtin_libogg"] = False # Needed to link against system opus - env.ParseConfig("pkg-config opus opusfile --cflags --libs") - if not env["builtin_libogg"]: env.ParseConfig("pkg-config ogg --cflags --libs") diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 3f967781b2..36fff4e12a 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -94,7 +94,6 @@ def configure(env): env["AR"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-ar" env["RANLIB"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-ranlib" env["AS"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-as" - env.Append(CPPDEFINES=["__MACPORTS__"]) # hack to fix libvpx MM256_BROADCASTSI128_SI256 define else: env["CC"] = "clang" env["CXX"] = "clang++" @@ -122,7 +121,6 @@ def configure(env): env["AR"] = basecmd + "ar" env["RANLIB"] = basecmd + "ranlib" env["AS"] = basecmd + "as" - env.Append(CPPDEFINES=["__MACPORTS__"]) # hack to fix libvpx MM256_BROADCASTSI128_SI256 define if env["use_ubsan"] or env["use_asan"] or env["use_tsan"]: env.extra_suffix += "s" |