From 1508f3a3207b291e1854df4b3e5e4ccb7c77d5a3 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Wed, 19 Sep 2018 23:03:35 -0400
Subject: [PATCH] MP Libopenmpt: Make explicit OPENMPT=1 for non-windows
 platforms

---
 src/Makefile           | 15 ++++++++++++++-
 src/win32/Makefile.cfg | 12 ++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 59281c93a9..2fa06fdc3c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -73,7 +73,8 @@
 #     Compile without BSD API, add 'NONET=1'
 #     Compile without IPX/SPX, add 'NOIPX=1'
 #     Compile Mingw/SDL with S_DS3S, add 'DS3D=1'
-#     Compile without libopenmpt, add 'NOOPENMPT=1'
+#     Compile without libopenmpt on Windows, add 'NOOPENMPT=1'
+#     Compile with libopenmpt on other platforms, add 'OPENMPT=1'
 #     Compile with S_FMOD3D, add 'FMOD=1' (WIP)
 #     Compile with S_OPENAL, add 'OPENAL=1' (WIP)
 #     To link with the whole SDL_Image lib to load Icons, add 'SDL_IMAGE=1' but it isn't not realy needed
@@ -186,9 +187,21 @@ HAVE_LIBGME=1
 endif
 endif
 
+ifdef MINGW
+ifndef NOOPENMPT
+HAVE_OPENMPT=1
+endif
+else
+ifdef MINGW64
 ifndef NOOPENMPT
 HAVE_OPENMPT=1
 endif
+else
+ifdef OPENMPT
+HAVE_OPENMPT=1
+endif
+endif
+endif
 
 ifdef SOLARIS
 UNIXCOMMON=1
diff --git a/src/win32/Makefile.cfg b/src/win32/Makefile.cfg
index 2eb39564ca..300e8b3cb9 100644
--- a/src/win32/Makefile.cfg
+++ b/src/win32/Makefile.cfg
@@ -9,18 +9,26 @@
 ifdef MINGW64
 	NOASM=1
 	NONX86=1
-	SDL_CFLAGS?=-I../libs/SDL2/x86_64-w64-mingw32/include/SDL2 -I../libs/SDL2_mixer/x86_64-w64-mingw32/include/SDL2 -Dmain=SDL_main
-	SDL_LDFLAGS?=-L../libs/SDL2/x86_64-w64-mingw32/lib -L../libs/SDL2_mixer/x86_64-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows
+
+ifndef NOOPENMPT
 	HAVE_OPENMPT=1
 	LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc
 	LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86_64 -llibopenmpt
+endif
+
+	SDL_CFLAGS?=-I../libs/SDL2/x86_64-w64-mingw32/include/SDL2 -I../libs/SDL2_mixer/x86_64-w64-mingw32/include/SDL2 -Dmain=SDL_main
+	SDL_LDFLAGS?=-L../libs/SDL2/x86_64-w64-mingw32/lib -L../libs/SDL2_mixer/x86_64-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows
 else
 	HAVE_LIBGME=1
 	LIBGME_CFLAGS=-I../libs/gme/include
 	LIBGME_LDFLAGS=-L../libs/gme/win32 -lgme
+
+ifndef NOOPENMPT
 	HAVE_OPENMPT=1
 	LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc
 	LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86 -llibopenmpt
+endif
+
 	SDL_CFLAGS?=-I../libs/SDL2/i686-w64-mingw32/include/SDL2 -I../libs/SDL2_mixer/i686-w64-mingw32/include/SDL2 -Dmain=SDL_main
 	SDL_LDFLAGS?=-L../libs/SDL2/i686-w64-mingw32/lib -L../libs/SDL2_mixer/i686-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows
 endif
-- 
GitLab