[Scummvm-git-logs] scummvm master -> 7505e2cce6b920d925d1a32be518e9757f80902f

sev- noreply at scummvm.org
Mon Apr 10 18:14:28 UTC 2023 

This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
08162b019a CI: Add libmikmod to Ubuntu runners
db9f13d475 CREATE_PROJECT: Add libmikmod support
791547f10d AUDIO: Fix mikmod.h build on Windows
440b05bd88 CI: Add libmikmod support to Xcode macOS runners
7505e2cce6 CI: Add libmikmod support to Windows runners


Commit: 08162b019a8509c11ce0bdf6f447470b381fd20d
    https://github.com/scummvm/scummvm/commit/08162b019a8509c11ce0bdf6f447470b381fd20d
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-04-10T20:14:22+02:00

Commit Message:
CI: Add libmikmod to Ubuntu runners

Changed paths:
    .github/workflows/ci.yml


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 06b5fe0222e..30365916f69 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -160,11 +160,11 @@ jobs:
           - platform: ubuntu-latest
             sdlConfig: sdl2-config
             cxx: ccache g++
-            aptPackages: 'liba52-dev libcurl4-openssl-dev libfaad-dev libflac-dev libfluidsynth-dev libfreetype6-dev libfribidi-dev libgif-dev libgtk-3-dev libjpeg-turbo8-dev libmad0-dev libmpeg2-4-dev libogg-dev libpng-dev libsdl2-dev libsdl2-net-dev libsndio-dev libspeechd-dev libtheora-dev libunity-dev libvorbis-dev libvpx-dev zlib1g-dev'
+            aptPackages: 'liba52-dev libcurl4-openssl-dev libfaad-dev libflac-dev libfluidsynth-dev libfreetype6-dev libfribidi-dev libgif-dev libgtk-3-dev libjpeg-turbo8-dev libmad0-dev libmikmod-dev libmpeg2-4-dev libogg-dev libpng-dev libsdl2-dev libsdl2-net-dev libsndio-dev libspeechd-dev libtheora-dev libunity-dev libvorbis-dev libvpx-dev zlib1g-dev'
           - platform: ubuntu-20.04
             sdlConfig: sdl-config
             cxx: ccache g++-4.8
-            aptPackages: 'g++-4.8 liba52-dev libcurl4-openssl-dev libfaad-dev libflac-dev libfluidsynth-dev libfreetype6-dev libfribidi-dev libgif-dev libgtk-3-dev libjpeg-turbo8-dev libmad0-dev libmpeg2-4-dev libogg-dev libpng-dev libsdl-net1.2-dev libsdl1.2-dev libsndio-dev libspeechd-dev libtheora-dev libunity-dev libvorbis-dev libvpx-dev zlib1g-dev'
+            aptPackages: 'g++-4.8 liba52-dev libcurl4-openssl-dev libfaad-dev libflac-dev libfluidsynth-dev libfreetype6-dev libfribidi-dev libgif-dev libgtk-3-dev libjpeg-turbo8-dev libmad0-dev libmikmod-dev libmpeg2-4-dev libogg-dev libpng-dev libsdl-net1.2-dev libsdl1.2-dev libsndio-dev libspeechd-dev libtheora-dev libunity-dev libvorbis-dev libvpx-dev zlib1g-dev'
     env:
       SDL_CONFIG: ${{ matrix.sdlConfig }}
     defaults:


Commit: db9f13d47569bd996668a90bec683300c250d9e4
    https://github.com/scummvm/scummvm/commit/db9f13d47569bd996668a90bec683300c250d9e4
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-04-10T20:14:22+02:00

Commit Message:
CREATE_PROJECT: Add libmikmod support

Changed paths:
    devtools/create_project/cmake.cpp
    devtools/create_project/create_project.cpp
    devtools/create_project/msvc.cpp
    devtools/create_project/xcode.cpp


diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp
index 782ca5f84ba..dfaf53b4d00 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -48,6 +48,7 @@ const CMakeProvider::Library *CMakeProvider::getLibraryFromFeature(const char *f
 		LibraryProps("sdlnet", "SDL2_net", kSDLVersion2).Libraries("SDL2_net"),
 		LibraryProps("flac", "flac").Libraries("FLAC"),
 		LibraryProps("mad", "mad").Libraries("mad"),
+		LibraryProps("mikmod", "mikmod").Libraries("mikmod"),
 		LibraryProps("ogg", "ogg").Libraries("ogg"),
 		LibraryProps("vorbis", "vorbisfile vorbis").Libraries("vorbisfile vorbis"),
 		LibraryProps("tremor", "vorbisidec").Libraries("vorbisidec"),
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 0d79728750f..873c4e7eff6 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1066,6 +1066,7 @@ const Feature s_features[] = {
 	{       "png",         "USE_PNG", true, true,  "libpng support" },
 	{       "gif",         "USE_GIF", true, false, "libgif support" },
 	{      "faad",        "USE_FAAD", true, false, "AAC support" },
+	{    "mikmod",      "USE_MIKMOD", true, false, "libmikmod support" },
 	{     "mpeg2",       "USE_MPEG2", true, true,  "MPEG-2 support" },
 	{ "theoradec",   "USE_THEORADEC", true, true,  "Theora decoding support" },
 	{       "vpx",         "USE_VPX", true, false, "VP8/VP9 decoding support" },
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index e15c88ce319..44f0636cf48 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -65,6 +65,7 @@ std::string MSVCProvider::getLibraryFromFeature(const char *feature, const Build
 		{       "png", "libpng16.lib",              "libpng16d.lib", nullptr,                                           nullptr },
 		{       "gif", "gif.lib",                   nullptr,         nullptr,                                           nullptr },
 		{      "faad", "faad.lib",                  nullptr,         nullptr,                                           "libfaad.lib" },
+		{    "mikmod", "mikmod.lib",                nullptr,         nullptr,                                           nullptr },
 		{     "mpeg2", "mpeg2.lib",                 nullptr,         nullptr,                                           "libmpeg2.lib" },
 		{ "theoradec", "theora.lib",                nullptr,         nullptr,                                           "libtheora_static.lib" },
 		{       "vpx", "vpx.lib",                   nullptr,         nullptr,                                           nullptr },
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index c66ae4d5905..52f2c359cc2 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -502,6 +502,9 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
 	if (CONTAINS_DEFINE(setup.defines, "USE_MAD")) {
 		DEF_LOCALLIB_STATIC("libmad");
 	}
+	if (CONTAINS_DEFINE(setup.defines, "USE_MIKMOD")) {
+		DEF_LOCALLIB_STATIC("libmikmod");
+	}
 	if (CONTAINS_DEFINE(setup.defines, "USE_MPEG2")) {
 		DEF_LOCALLIB_STATIC("libmpeg2");
 	}
@@ -625,6 +628,9 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
 	if (CONTAINS_DEFINE(setup.defines, "USE_MAD")) {
 		frameworks_iOS.push_back("libmad.a");
 	}
+	if (CONTAINS_DEFINE(setup.defines, "USE_MIKMOD")) {
+		frameworks_iOS.push_back("libmikmod.a");
+	}
 	if (CONTAINS_DEFINE(setup.defines, "USE_MPEG2")) {
 		frameworks_iOS.push_back("libmpeg2.a");
 	}
@@ -716,6 +722,9 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
 	if (CONTAINS_DEFINE(setup.defines, "USE_MAD")) {
 		frameworks_osx.push_back("libmad.a");
 	}
+	if (CONTAINS_DEFINE(setup.defines, "USE_MIKMOD")) {
+		frameworks_osx.push_back("libmikmod.a");
+	}
 	if (CONTAINS_DEFINE(setup.defines, "USE_MPEG2")) {
 		frameworks_osx.push_back("libmpeg2.a");
 	}


Commit: 791547f10df6a4bbdd019806df64316288f54c08
    https://github.com/scummvm/scummvm/commit/791547f10df6a4bbdd019806df64316288f54c08
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-04-10T20:14:22+02:00

Commit Message:
AUDIO: Fix mikmod.h build on Windows

setjmp() and unlink() symbols may be triggered on Windows.

Changed paths:
    audio/mods/impulsetracker.cpp


diff --git a/audio/mods/impulsetracker.cpp b/audio/mods/impulsetracker.cpp
index 463f395de1b..9a6e2ed7839 100644
--- a/audio/mods/impulsetracker.cpp
+++ b/audio/mods/impulsetracker.cpp
@@ -23,6 +23,12 @@
 // mikmod headers.
 #define FORBIDDEN_SYMBOL_EXCEPTION_FILE
 
+// On Windows, unlink and setjmp may also be triggered.
+#if defined(WIN32)
+#define FORBIDDEN_SYMBOL_EXCEPTION_unlink
+#define FORBIDDEN_SYMBOL_EXCEPTION_setjmp
+#endif
+
 #include "audio/mods/impulsetracker.h"
 
 #ifdef USE_MIKMOD


Commit: 440b05bd88a5ade347e2ef6a6a19fc838933c4ab
    https://github.com/scummvm/scummvm/commit/440b05bd88a5ade347e2ef6a6a19fc838933c4ab
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-04-10T20:14:22+02:00

Commit Message:
CI: Add libmikmod support to Xcode macOS runners

Changed paths:
    .github/workflows/ci.yml


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 30365916f69..13587f92e84 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -107,8 +107,8 @@ jobs:
         include:
           - platform: macosx
             buildFlags: -scheme ScummVM-macOS
-            configFlags: --disable-nasm --enable-faad --enable-gif --enable-mpeg2 --enable-vpx
-            brewPackages: a52dec faad2 flac fluid-synth freetype fribidi giflib jpeg mad libmpeg2 libogg libpng libvorbis libvpx sdl2 sdl2_net theora
+            configFlags: --disable-nasm --enable-faad --enable-gif --enable-mikmod --enable-mpeg2 --enable-vpx
+            brewPackages: a52dec faad2 flac fluid-synth freetype fribidi giflib jpeg mad libmikmod libmpeg2 libogg libpng libvorbis libvpx sdl2 sdl2_net theora
           - platform: ios7
             buildFlags: -scheme ScummVM-iOS CODE_SIGN_IDENTITY="" CODE_SIGNING_ALLOWED=NO
             configFlags: --disable-nasm --disable-opengl --disable-theoradec --disable-mpeg2 --disable-taskbar --disable-tts --disable-fribidi


Commit: 7505e2cce6b920d925d1a32be518e9757f80902f
    https://github.com/scummvm/scummvm/commit/7505e2cce6b920d925d1a32be518e9757f80902f
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-04-10T20:14:22+02:00

Commit Message:
CI: Add libmikmod support to Windows runners

Changed paths:
    .github/workflows/ci.yml


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 13587f92e84..0a655656348 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,21 +15,21 @@ jobs:
           - platform: win32
             triplet: x86-windows
             arch: x86
-            configFlags: --enable-discord --enable-faad --enable-gif --enable-mpeg2 --enable-vpx
-            vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype fribidi giflib libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis libvpx sdl2 sdl2-net zlib'
+            configFlags: --enable-discord --enable-faad --enable-gif --enable-mikmod --enable-mpeg2 --enable-vpx
+            vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype fribidi giflib libflac libjpeg-turbo libmad libmikmod libmpeg2 libogg libpng libtheora libvorbis libvpx sdl2 sdl2-net zlib'
             useNasm: 'true'
           - platform: x64
             arch: x64
             triplet: x64-windows
-            configFlags: --enable-discord --enable-faad --enable-gif --enable-mpeg2 --enable-vpx
-            vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype fribidi giflib libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis libvpx sdl2 sdl2-net zlib'
+            configFlags: --enable-discord --enable-faad --enable-gif --enable-mikmod --enable-mpeg2 --enable-vpx
+            vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype fribidi giflib libflac libjpeg-turbo libmad libmikmod libmpeg2 libogg libpng libtheora libvorbis libvpx sdl2 sdl2-net zlib'
           - platform: arm64
             arch: arm64
             triplet: arm64-windows
             # fribidi is disabled due to https://github.com/microsoft/vcpkg/issues/11248 [fribidi] Fribidi doesn't cross-compile on x86-64 to target arm/arm64
             # Note that fribidi is also disabled on arm64 in devtools/create_project/msvc.cpp
-            configFlags: --enable-discord --enable-faad --enable-gif --enable-mpeg2 --enable-vpx --disable-fribidi --disable-opengl
-            vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype giflib libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis libvpx sdl2 sdl2-net zlib'
+            configFlags: --enable-discord --enable-faad --enable-gif --enable-mikmod --enable-mpeg2 --enable-vpx --disable-fribidi --disable-opengl
+            vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype giflib libflac libjpeg-turbo libmad libmikmod libmpeg2 libogg libpng libtheora libvorbis libvpx sdl2 sdl2-net zlib'
     env:
       CONFIGURATION: Debug
       PLATFORM: ${{ matrix.platform }}

More information about the Scummvm-git-logs mailing list