Merge pull request #7 from OpenMPT/master

Update
TTKMedia · Aug 30, 2023 · d361792 · d361792
2 parents 833fe50 + 6a61af4
commit d361792
Show file tree

Hide file tree

Showing 733 changed files with 10,882 additions and 9,660 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -33,7 +33,7 @@ task:
 task:
     name: macos13-xcode14
     macos_instance:
-        image: ghcr.io/cirruslabs/macos-ventura-xcode:14.3
+        image: ghcr.io/cirruslabs/macos-ventura-xcode:14.3.1
     install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1
     test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check
@@ -49,15 +49,15 @@ task:
 task:
     name: macos12-xcode13
     macos_instance:
-        image: ghcr.io/cirruslabs/macos-monterey-xcode:13.4.1
+        image: ghcr.io/cirruslabs/macos-monterey-xcode:13
     install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1
     test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check
 
 task:
     name: macos12-xcode13-legacy
     macos_instance:
-        image: ghcr.io/cirruslabs/macos-monterey-xcode:13.4.1
+        image: ghcr.io/cirruslabs/macos-monterey-xcode:13
     install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     build_script: env CFLAGS="-mmacosx-version-min=10.13 -arch x86_64" CXXFLAGS="-mmacosx-version-min=10.13 -arch x86_64" LDFLAGS="-mmacosx-version-min=10.13 -arch x86_64" make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1
     test_script: env CFLAGS="-mmacosx-version-min=10.13 -arch x86_64" CXXFLAGS="-mmacosx-version-min=10.13 -arch x86_64" LDFLAGS="-mmacosx-version-min=10.13 -arch x86_64" make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check
diff --git a/.github/workflows/FreeBSD-12.4-Makefile.yml b/.github/workflows/FreeBSD-12.4-Makefile.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - uses: cross-platform-actions/action@v0.13.0
+    - uses: cross-platform-actions/action@v0.18.0
       with:
         architecture: x86_64
         hypervisor: xhyve

diff --git a/.github/workflows/FreeBSD-13.2-Makefile.yml b/.github/workflows/FreeBSD-13.2-Makefile.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - uses: cross-platform-actions/action@v0.13.0
+    - uses: cross-platform-actions/action@v0.18.0
       with:
         architecture: x86_64
         hypervisor: xhyve

diff --git a/.github/workflows/NetBSD-9.2-Makefile.yml → .github/workflows/NetBSD-9.3-Makefile.yml b/.github/workflows/NetBSD-9.2-Makefile.yml → .github/workflows/NetBSD-9.3-Makefile.yml
@@ -1,4 +1,4 @@
-name: NetBSD 9.2 Makefile
+name: NetBSD 9.3 Makefile
 
 on:
   push:
@@ -13,16 +13,16 @@ concurrency:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: macos-12
 
     steps:
     - uses: actions/checkout@v3
-    - uses: cross-platform-actions/action@v0.13.0
+    - uses: cross-platform-actions/action@v0.18.0
       with:
         architecture: x86_64
         hypervisor: qemu
         operating_system: netbsd
-        version: '9.2'
+        version: '9.3'
         shell: bash
         run: |
           sudo pkgin -y install subversion git p5-XML-XPath mawk

diff --git a/.github/workflows/OpenBSD-7.3-Makefile.yml b/.github/workflows/OpenBSD-7.3-Makefile.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - uses: cross-platform-actions/action@v0.13.0
+    - uses: cross-platform-actions/action@v0.18.0
       with:
         architecture: x86_64
         hypervisor: xhyve

diff --git a/.gitignore b/.gitignore
@@ -130,8 +130,11 @@
 /include/vstsdk2.4
 /include/ASIOSDK2/*
 /include/allegro42/*
+/include/ancient/*.gitattributes
 /include/ancient/.github
 /include/ancient/.gitignore
+/include/ancient/Ancient.sln
+/include/ancient/Ancient.vcxproj
 /include/ancient/Makefile.am
 /include/ancient/Makefile.unix
 /include/ancient/README.md
@@ -142,6 +145,8 @@
 /include/ancient/libancient.pc.in
 /include/ancient/main.cpp
 /include/ancient/test.sh
+/include/ancient/testing
+/include/ancient/src/attic
 /include/asiomodern/changelog.txt
 /include/asiomodern/package.cmd
 /include/asiomodern/package_helper_getversion.cmd
@@ -669,6 +674,8 @@
 /include/premake/build/vs2019/.vs
 /include/premake/build/vs2019/bin
 /include/premake/build/vs2019/obj
+/include/premake/build/vs2022/bin
+/include/premake/build/vs2022/obj
 /include/pugixml/CMakeLists.txt
 /include/pugixml/docs
 /include/pugixml/scripts

diff --git a/build/auto/update_package_template.cmd b/build/auto/update_package_template.cmd
@@ -36,7 +36,7 @@ copy /y ..\include\soundtouch\COPYING.TXT                 .\Licenses\License.Sou
 rem copy /y ..\include\stb_vorbis\stb_vorbis.c                .\Licenses\License.stb_vorbis.txt || goto error
 copy /y ..\include\unrar\license.txt                      .\Licenses\License.UnRAR.txt || goto error
 copy /y ..\include\vorbis\COPYING                         .\Licenses\License.Vorbis.txt || goto error
-copy /y ..\include\zlib\README                            .\Licenses\License.zlib.txt || goto error
+copy /y ..\include\zlib\LICENSE                            .\Licenses\License.zlib.txt || goto error
 copy /y ..\include\zlib\contrib\minizip\MiniZip64_info.txt .\Licenses\License.minizip.txt || goto error
 cd .. || goto error
 

diff --git a/build/auto/update_package_template_retro.cmd b/build/auto/update_package_template_retro.cmd
@@ -36,7 +36,7 @@ copy /y ..\include\soundtouch\COPYING.TXT                 .\Licenses\License.Sou
 rem copy /y ..\include\stb_vorbis\stb_vorbis.c                .\Licenses\License.stb_vorbis.txt || goto error
 copy /y ..\include\unrar\license.txt                      .\Licenses\License.UnRAR.txt || goto error
 copy /y ..\include\vorbis\COPYING                         .\Licenses\License.Vorbis.txt || goto error
-copy /y ..\include\zlib\README                            .\Licenses\License.zlib.txt || goto error
+copy /y ..\include\zlib\LICENSE                            .\Licenses\License.zlib.txt || goto error
 copy /y ..\include\zlib\contrib\minizip\MiniZip64_info.txt .\Licenses\License.minizip.txt || goto error
 cd .. || goto error
 

diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am
@@ -149,6 +149,7 @@ MPT_FILES_SRC_MPT += src/mpt/base/saturate_cast.hpp
 MPT_FILES_SRC_MPT += src/mpt/base/saturate_round.hpp
 MPT_FILES_SRC_MPT += src/mpt/base/secure.hpp
 MPT_FILES_SRC_MPT += src/mpt/base/semantic_version.hpp
+MPT_FILES_SRC_MPT += src/mpt/base/size.hpp
 MPT_FILES_SRC_MPT += src/mpt/base/source_location.hpp
 MPT_FILES_SRC_MPT += src/mpt/base/span.hpp
 MPT_FILES_SRC_MPT += src/mpt/base/utility.hpp

diff --git a/build/build_tools.cmd b/build/build_tools.cmd
@@ -24,6 +24,19 @@ goto main
 
 
 
+if exist "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" (
+ call build\auto\setup_vs2022.cmd || goto error
+ rem cd include\premake || goto error
+ rem  nmake -f Bootstrap.mak windows MSDEV=vs2022 || goto error
+ rem  bin\release\premake5 embed --bytecode || goto error
+ rem  bin\release\premake5 --to=build/vs2022 vs2022 --no-curl --no-zlib --no-luasocket || goto error
+ rem cd ..\.. || goto error
+ cd include\premake\build\vs2022 || goto error
+  msbuild Premake5.sln /target:Clean /property:Configuration=Release;Platform=x64 /maxcpucount /verbosity:minimal || goto error
+  msbuild Premake5.sln /target:Build /property:Configuration=Release;Platform=x64 /maxcpucount /verbosity:minimal || goto error
+ cd ..\..\..\.. || goto error
+ goto premakedone
+)
 if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" (
  call build\auto\setup_vs2019.cmd || goto error
  rem cd include\premake || goto error
@@ -32,8 +45,8 @@ if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxil
  rem  bin\release\premake5 --to=build/vs2019 vs2019 --no-curl --no-zlib --no-luasocket || goto error
  rem cd ..\.. || goto error
  cd include\premake\build\vs2019 || goto error
-  msbuild Premake5.sln /target:Clean /property:Configuration=Release;Platform=Win32 /maxcpucount /verbosity:minimal || goto error
-  msbuild Premake5.sln /target:Build /property:Configuration=Release;Platform=Win32 /maxcpucount /verbosity:minimal || goto error
+  msbuild Premake5.sln /target:Clean /property:Configuration=Release;Platform=x64 /maxcpucount /verbosity:minimal || goto error
+  msbuild Premake5.sln /target:Build /property:Configuration=Release;Platform=x64 /maxcpucount /verbosity:minimal || goto error
  cd ..\..\..\.. || goto error
  goto premakedone
 )
@@ -45,8 +58,8 @@ if exist "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\B
  rem  bin\release\premake5 --to=build/vs2019 vs2019 --no-curl --no-zlib --no-luasocket || goto error
  rem cd ..\.. || goto error
  cd include\premake\build\vs2019 || goto error
-  msbuild Premake5.sln /target:Clean /property:Configuration=Release;Platform=Win32 /maxcpucount /verbosity:minimal || goto error
-  msbuild Premake5.sln /target:Build /property:Configuration=Release;Platform=Win32 /maxcpucount /verbosity:minimal || goto error
+  msbuild Premake5.sln /target:Clean /property:Configuration=Release;Platform=x64 /maxcpucount /verbosity:minimal || goto error
+  msbuild Premake5.sln /target:Build /property:Configuration=Release;Platform=x64 /maxcpucount /verbosity:minimal || goto error
  cd ..\..\..\.. || goto error
  goto premakedone
 )
@@ -58,8 +71,8 @@ if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxil
  rem  bin\release\premake5 --to=build/vs2017 vs2017 --no-curl --no-zlib --no-luasocket || goto error
  rem cd ..\.. || goto error
  cd include\premake\build\vs2017 || goto error
-  msbuild Premake5.sln /target:Clean /property:Configuration=Release;Platform=Win32 /maxcpucount /verbosity:minimal || goto error
-  msbuild Premake5.sln /target:Build /property:Configuration=Release;Platform=Win32 /maxcpucount /verbosity:minimal || goto error
+  msbuild Premake5.sln /target:Clean /property:Configuration=Release;Platform=x64 /maxcpucount /verbosity:minimal || goto error
+  msbuild Premake5.sln /target:Build /property:Configuration=Release;Platform=x64 /maxcpucount /verbosity:minimal || goto error
  cd ..\..\..\.. || goto error
  goto premakedone
 )
@@ -71,8 +84,8 @@ if exist "C:\Program Files\Microsoft Visual Studio\2017\Community\VC\Auxiliary\B
  rem  bin\release\premake5 --to=build/vs2017 vs2017 --no-curl --no-zlib --no-luasocket || goto error
  rem cd ..\.. || goto error
  cd include\premake\build\vs2017 || goto error
-  msbuild Premake5.sln /target:Clean /property:Configuration=Release;Platform=Win32 /maxcpucount /verbosity:minimal || goto error
-  msbuild Premake5.sln /target:Build /property:Configuration=Release;Platform=Win32 /maxcpucount /verbosity:minimal || goto error
+  msbuild Premake5.sln /target:Clean /property:Configuration=Release;Platform=x64 /maxcpucount /verbosity:minimal || goto error
+  msbuild Premake5.sln /target:Build /property:Configuration=Release;Platform=x64 /maxcpucount /verbosity:minimal || goto error
  cd ..\..\..\.. || goto error
  goto premakedone
 )

diff --git a/build/download_externals.cmd b/build/download_externals.cmd
@@ -44,7 +44,7 @@ call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.un4seen.com/fi
 call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20200918004813if_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build\externals\htmlhelp.exe"                 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 3509072 || goto error
 
 
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.python.org/ftp/python/3.11.3/python-3.11.3-embed-amd64.zip"                          "build\externals\python-3.11.3-embed-amd64.zip" d0449f8450adf052b4f7c8fe94444482f1fd59f7dff4de38ddef1741061c60163af310edd0b1ffd93d322da3b4db9cb553a574a949ae4fcb0004594f25881501 10569806 || goto error
+call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.python.org/ftp/python/3.11.4/python-3.11.4-embed-amd64.zip"                          "build\externals\python-3.11.4-embed-amd64.zip" 3f93c2a16764b9ea6343315b70c0c6319aac8edaefbf4e21206fb30eff365e8fe37264a9133bebe12e664ea5d8fd232d587a5603a51fd96e1252a2fc01a2e550 10591509 || goto error
 
 
 call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp%%%%200.50/innounp050.rar"  "build\externals\innounp050.rar"               dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330  141621 || goto error
@@ -73,7 +73,7 @@ call build\scriptlib\unpack.cmd "build\tools\htmlhelp" "build\externals\htmlhelp
 call build\scriptlib\unpack.cmd "include\winamp"   "build\externals\WA5.55_SDK.exe" "."          || goto error
 call build\scriptlib\unpack.cmd "include\xmplay"   "build\externals\xmp-sdk.zip"    "."          || goto error
 
-call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.11.3-embed-amd64.zip" "." || goto error
+call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.11.4-embed-amd64.zip" "." || goto error
 
 call :killdir "build\tools\innounp"   || goto error
 call :killdir "build\tools\innosetup" || goto error

diff --git a/build/make/config-emscripten.mk b/build/make/config-emscripten.mk
@@ -48,8 +48,8 @@ LDFLAGS  += -pthread
 endif
 
 ifeq ($(EMSCRIPTEN_PORTS),1)
-CXXFLAGS += -s USE_ZLIB=1 -sUSE_MPG123=1 -sUSE_OGG=1 -sUSE_VORBIS=1 -DMPT_WITH_ZLIB -DMPT_WITH_MPG123 -DMPT_WITH_VORBIS -DMPT_WITH_VORBISFI
-CFLAGS   += -s USE_ZLIB=1 -sUSE_MPG123=1 -sUSE_OGG=1 -sUSE_VORBIS=1 -DMPT_WITH_ZLIB -DMPT_WITH_MPG123 -DMPT_WITH_VORBIS -DMPT_WITH_VORBISFI
+CXXFLAGS += -s USE_ZLIB=1 -sUSE_MPG123=1 -sUSE_OGG=1 -sUSE_VORBIS=1 -DMPT_WITH_ZLIB -DMPT_WITH_MPG123 -DMPT_WITH_VORBIS -DMPT_WITH_VORBISFILE -DMPT_WITH_OGG
+CFLAGS   += -s USE_ZLIB=1 -sUSE_MPG123=1 -sUSE_OGG=1 -sUSE_VORBIS=1 -DMPT_WITH_ZLIB -DMPT_WITH_MPG123 -DMPT_WITH_VORBIS -DMPT_WITH_VORBISFILE -DMPT_WITH_OGG
 LDFLAGS  += -s USE_ZLIB=1 -sUSE_MPG123=1 -sUSE_OGG=1 -sUSE_VORBIS=1
 NO_MINIZ=1
 NO_MINIMP3=1
@@ -72,7 +72,7 @@ LDFLAGS  += -flto
 
 ifeq ($(EMSCRIPTEN_TARGET),default)
 # emits whatever is emscripten's default, currently (1.38.8) this is the same as "wasm" below.
-CPPFLAGS += -DMPT_BUILD_WASM
+CPPFLAGS += 
 CXXFLAGS += 
 CFLAGS   += 
 LDFLAGS  += 
@@ -81,7 +81,7 @@ LDFLAGS += -s ALLOW_MEMORY_GROWTH=1
 
 else ifeq ($(EMSCRIPTEN_TARGET),all)
 # emits native wasm AND javascript with full wasm optimizations.
-CPPFLAGS += -DMPT_BUILD_WASM
+CPPFLAGS += 
 CXXFLAGS += 
 CFLAGS   += 
 LDFLAGS  += -s WASM=2 -s LEGACY_VM_SUPPORT=1 -Wno-transpile
@@ -95,7 +95,7 @@ LDFLAGS += -s ALLOW_MEMORY_GROWTH=1
 
 else ifeq ($(EMSCRIPTEN_TARGET),audioworkletprocessor)
 # emits an es6 module in a single file suitable for use in an AudioWorkletProcessor
-CPPFLAGS += -DMPT_BUILD_WASM -DMPT_BUILD_AUDIOWORKLETPROCESSOR
+CPPFLAGS += -DMPT_BUILD_AUDIOWORKLETPROCESSOR
 CXXFLAGS += 
 CFLAGS   += 
 LDFLAGS  += -s WASM=1 -s WASM_ASYNC_COMPILATION=0 -s MODULARIZE=1 -s EXPORT_ES6=1 -s SINGLE_FILE=1
@@ -104,7 +104,7 @@ LDFLAGS += -s ALLOW_MEMORY_GROWTH=1
 
 else ifeq ($(EMSCRIPTEN_TARGET),wasm)
 # emits native wasm.
-CPPFLAGS += -DMPT_BUILD_WASM
+CPPFLAGS += 
 CXXFLAGS += 
 CFLAGS   += 
 LDFLAGS  += -s WASM=1
@@ -113,7 +113,7 @@ LDFLAGS += -s ALLOW_MEMORY_GROWTH=1
 
 else ifeq ($(EMSCRIPTEN_TARGET),js)
 # emits only plain javascript with plain javascript focused optimizations.
-CPPFLAGS += -DMPT_BUILD_ASMJS
+CPPFLAGS += 
 CXXFLAGS += 
 CFLAGS   += 
 LDFLAGS  += -s WASM=0 -s LEGACY_VM_SUPPORT=1 -Wno-transpile
@@ -129,7 +129,7 @@ endif
 
 CXXFLAGS += -s DISABLE_EXCEPTION_CATCHING=0
 CFLAGS   += -s DISABLE_EXCEPTION_CATCHING=0 -fno-strict-aliasing
-LDFLAGS  += -s DISABLE_EXCEPTION_CATCHING=0 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s ERROR_ON_MISSING_LIBRARIES=1 -s EXPORT_NAME="'libopenmpt'"
+LDFLAGS  += -s DISABLE_EXCEPTION_CATCHING=0 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s ERROR_ON_MISSING_LIBRARIES=1 -s EXPORT_NAME="'libopenmpt'" -s EXPORTED_FUNCTIONS="['_malloc','_free']"
 
 include build/make/warnings-clang.mk
 

diff --git a/build/premake/ext-UnRAR.lua b/build/premake/ext-UnRAR.lua
@@ -141,7 +141,20 @@
 			"/wd6262",
 			"/wd28159",
 		} -- analyze
-  filter {}
+	filter {}
+		if _OPTIONS["clang"] then
+			buildoptions {
+				"-Wno-dangling-else",
+				"-Wno-logical-not-parentheses",
+				"-Wno-logical-op-parentheses",
+				"-Wno-missing-braces",
+				"-Wno-switch",
+				"-Wno-unused-but-set-variable",
+				"-Wno-unused-function",
+				"-Wno-unused-variable",
+			}
+		end
+	filter {}
   filter { "kind:SharedLib" }
    files { "../../include/unrar/dll_nocrypt.def" }
   filter {}

diff --git a/build/premake/ext-flac.lua b/build/premake/ext-flac.lua
@@ -25,8 +25,10 @@
    "../../include/flac/src/libFLAC/cpu.c",
    "../../include/flac/src/libFLAC/crc.c",
    "../../include/flac/src/libFLAC/fixed.c",
+   "../../include/flac/src/libFLAC/fixed_intrin_avx2.c",
    "../../include/flac/src/libFLAC/fixed_intrin_sse2.c",
    "../../include/flac/src/libFLAC/fixed_intrin_ssse3.c",
+   "../../include/flac/src/libFLAC/fixed_intrin_sse42.c",
    "../../include/flac/src/libFLAC/float.c",
    "../../include/flac/src/libFLAC/format.c",
    "../../include/flac/src/libFLAC/lpc.c",
@@ -113,7 +115,7 @@
   filter {}
   defines { "FLAC__HAS_OGG=1" }
   links { "ogg" }
-  defines { "PACKAGE_VERSION=\"1.4.2\"" }
+  defines { "PACKAGE_VERSION=\"1.4.3\"" }
   filter {}
   filter { "kind:StaticLib" }
    defines { "FLAC__NO_DLL" }

diff --git a/build/premake/ext-lame.lua b/build/premake/ext-lame.lua
@@ -59,6 +59,16 @@
 	filter { "action:vs*" }
 		buildoptions { "/wd6031", "/wd6262" } -- analyze
 	filter {}
+		if _OPTIONS["clang"] then
+			buildoptions {
+				"-Wno-absolute-value",
+				"-Wno-tautological-pointer-compare",
+				"-Wno-unused-but-set-variable",
+				"-Wno-unused-const-variable",
+				"-Wno-unused-function",
+			}
+		end
+	filter {}
 
 function mpt_use_lame ()
 	filter {}

diff --git a/build/premake/ext-minizip.lua b/build/premake/ext-minizip.lua
@@ -37,6 +37,15 @@
 	filter { "action:vs*" }
 		buildoptions { "/wd6262" } -- analyze
 	filter {}
+	filter {}
+		if _OPTIONS["clang"] then
+			buildoptions {
+				"-Wno-deprecated-non-prototype",
+				"-Wno-unused-but-set-variable",
+				"-Wno-unused-variable",
+			}
+		end
+	filter {}
 
 function mpt_use_minizip ()
 	filter {}

diff --git a/build/premake/ext-mpg123.lua b/build/premake/ext-mpg123.lua
@@ -55,7 +55,13 @@
   filter {}
   filter { "action:vs*" }
     buildoptions { "/wd6011", "/wd6285", "/wd6297", "/wd6305", "/wd6385", "/wd6386" } -- /analyze
-  filter {}
+	filter {}
+		if _OPTIONS["clang"] then
+			buildoptions {
+				"-Wno-unused-function",
+			}
+		end
+	filter {}
 
 function mpt_use_mpg123 ()
 	filter {}

diff --git a/build/premake/ext-opus.lua b/build/premake/ext-opus.lua
@@ -54,7 +54,14 @@
   filter {}
   filter { "action:vs*" }
 		buildoptions { "/wd6255", "/wd6297" } -- analyze
-  filter {}
+	filter {}
+		if _OPTIONS["clang"] then
+			buildoptions {
+				"-Wno-excess-initializers",
+				"-Wno-macro-redefined",
+			}
+		end
+	filter {}
   filter { "kind:SharedLib" }
    defines { "DLL_EXPORT" }
   filter {}