Merge remote-tracking branch 'origin/master' into awe32-modenvfc

.azure/azure-pipelines-android.yml

@@ -55,7 +55,7 @@ variables:
   # Must be the same as $ANDROID_NDK_HOME see:
   # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md
   # We cannot use $ANDROID_NDK_HOME because this is an environment variable, but here, we need a compile-time constant.
-  NDK: '/usr/local/lib/android/sdk/ndk/27.1.12297006'
+  NDK: '/usr/local/lib/android/sdk/ndk/27.2.12479018'
 
   # All the built binaries, libs and their headers will be installed here
   PREFIX: '$(DEV)/opt/android'

.azure/azure-pipelines-win.yml

@@ -29,13 +29,15 @@ jobs:
         artifact-prefix: "fluidsynth"
         CFLAGS: "/arch:IA32"
         CXXFLAGS: "/arch:IA32"
+        CMAKEFLAGS: "-Denable-libinstpatch=0"
       x64:
         platform: x64
         gtk-bundle: $(gtk-bundle-x64)
         libsndfile-url: $(libsndfile-url-x64)
         artifact-prefix: "fluidsynth"
         CFLAGS: ""
         CXXFLAGS: ""
+        CMAKEFLAGS: ""
   pool:
     vmImage: 'windows-2019'
   steps:
@@ -56,22 +58,26 @@ jobs:
         curl -LfsS -o libsndfile-dev.zip $(libsndfile-url) || exit -1
         7z x -aos -- gtk-bundle-dev.zip > NUL || exit -1
         7z x -aos -- libsndfile-dev.zip > NUL || exit -1
-        REM need to fix the naming of libsndfile otherwise the linker won't find it
-        mv lib\libsndfile-1.lib lib\sndfile.lib || exit -1
-        mv lib\libsndfile-1.def lib\sndfile.def || exit -1
+        rm *.zip
+        cd libsndfile-*
+        cp -rf * ..
+        cd ..
+        rm -rf libsndfile-*
         cd $(Build.ArtifactStagingDirectory)\libinstpatch-XP-$(platform)
         cp -rf * d:\deps\
         mv -f * ..
         cd ..
         rmdir $(Build.ArtifactStagingDirectory)\libinstpatch-XP-$(platform)\
+        cd d:\deps
+        dir
         DEL /F C:\Strawberry\perl\bin\pkg-config.bat
       displayName: 'Prerequisites'
     - script: |
         @ECHO ON
         SET "PATH=d:\deps\bin;%PATH%"
         pkg-config --list-all
         mkdir build && cd build || exit -1
-        cmake -Werror=dev -A $(platform) -T $(toolset) -DCMAKE_INSTALL_PREFIX=$(Build.ArtifactStagingDirectory) -Denable-readline=0 -Denable-floats=1 -Denable-jack=0 -Denable-sdl2=0 -DCMAKE_BUILD_TYPE=Release -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_VERBOSE_MAKEFILE=1 -DNO_GUI=1 -Dwindows-version=0x0501 .. || exit -1
+        cmake -Werror=dev -A $(platform) -T $(toolset) -DCMAKE_INSTALL_PREFIX=$(Build.ArtifactStagingDirectory) -Denable-readline=0 -Denable-floats=1 -Denable-jack=0 -Denable-sdl2=0 $(CMAKEFLAGS) -DCMAKE_BUILD_TYPE=Release -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_VERBOSE_MAKEFILE=1 -DNO_GUI=1 -Dwindows-version=0x0501 .. || exit -1
         cmake --build . --config Release --parallel 3 || exit -1
       displayName: 'Compile fluidsynth'
     - script: |
@@ -135,9 +141,13 @@ jobs:
         curl -LfsS -o libsndfile-dev.zip $(libsndfile-url) || exit -1
         7z x -aos -- gtk-bundle-dev.zip > NUL || exit -1
         7z x -aos -- libsndfile-dev.zip > NUL || exit -1
-        REM need to fix the naming of libsndfile otherwise the linker won't find it
-        mv lib\libsndfile-1.lib lib\sndfile.lib || exit -1
-        mv lib\libsndfile-1.def lib\sndfile.def || exit -1
+        rm *.zip
+        cd libsndfile-*
+        cp -rf * ..
+        cd ..
+        rm -rf libsndfile-*
+        cd d:\deps
+        dir
         DEL /F C:\Strawberry\perl\bin\pkg-config.bat
       displayName: 'Prerequisites'
     - script: |
@@ -200,9 +210,10 @@ jobs:
         7z x -aos -- libsndfile-dev.zip > NUL || exit -1
         7z x -aos -- mingw.zip > NUL || exit -1
         rm *.zip
-        REM need to fix the naming of libsndfile otherwise the linker won't find it
-        mv lib\libsndfile-1.lib lib\sndfile.lib || exit -1
-        mv lib\libsndfile-1.def lib\sndfile.def || exit -1
+        cd libsndfile-*
+        cp -rf * ..
+        cd ..
+        rm -rf libsndfile-*
         cd mingw*\ && cp -rf * .. && cd .. && rm -rf mingw* || exit -1
         cd $(Build.ArtifactStagingDirectory)\libinstpatch-$(platform) && cp -rf * d:\deps\ && mv -f * .. && cd .. &&  rmdir $(Build.ArtifactStagingDirectory)\libinstpatch-$(platform)\ || exit -1
         DEL /F C:\Strawberry\perl\bin\pkg-config.bat

cmake_admin/CodeCoverage.cmake

@@ -467,7 +467,7 @@ function(setup_target_for_coverage_gcovr_html)
 
     # Show info where to find the report
     add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
-        COMMAND ;
+        COMMAND "echo"
         COMMENT "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report."
     )