[OMPT-svn-commit] OpenMPT r22307 - trunk/OpenMPT/build/make

[<sv...@op...>]

Author: manx
Date: Mon Nov 25 19:34:42 2024
New Revision: 22307
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22307

Log:
[Imp] build: Makefile: MinGW: Honor ALLOW_LGPL.

Modified:
   trunk/OpenMPT/build/make/config-mingw-w64.mk
   trunk/OpenMPT/build/make/config-mingw.mk
   trunk/OpenMPT/build/make/config-mingw32crt.mk

Modified: trunk/OpenMPT/build/make/config-mingw-w64.mk
==============================================================================
--- trunk/OpenMPT/build/make/config-mingw-w64.mk	Mon Nov 25 19:32:31 2024	(r22306)
+++ trunk/OpenMPT/build/make/config-mingw-w64.mk	Mon Nov 25 19:34:42 2024	(r22307)
@@ -149,11 +149,19 @@
 
 IS_CROSS=1
 
+ifeq ($(ALLOW_LGPL),1)
+LOCAL_ZLIB=1
+LOCAL_MPG123=1
+LOCAL_OGG=1
+LOCAL_VORBIS=1
+else
 NO_ZLIB=1
 NO_MPG123=1
 NO_OGG=1
 NO_VORBIS=1
 NO_VORBISFILE=1
+endif
+
 NO_PORTAUDIO=1
 NO_PORTAUDIOCPP=1
 NO_PULSEAUDIO=1

Modified: trunk/OpenMPT/build/make/config-mingw.mk
==============================================================================
--- trunk/OpenMPT/build/make/config-mingw.mk	Mon Nov 25 19:32:31 2024	(r22306)
+++ trunk/OpenMPT/build/make/config-mingw.mk	Mon Nov 25 19:34:42 2024	(r22307)
@@ -102,11 +102,19 @@
 
 IS_CROSS=1
 
+ifeq ($(ALLOW_LGPL),1)
+LOCAL_ZLIB=1
+LOCAL_MPG123=1
+LOCAL_OGG=1
+LOCAL_VORBIS=1
+else
 NO_ZLIB=1
 NO_MPG123=1
 NO_OGG=1
 NO_VORBIS=1
 NO_VORBISFILE=1
+endif
+
 NO_PORTAUDIO=1
 NO_PORTAUDIOCPP=1
 NO_PULSEAUDIO=1

Modified: trunk/OpenMPT/build/make/config-mingw32crt.mk
==============================================================================
--- trunk/OpenMPT/build/make/config-mingw32crt.mk	Mon Nov 25 19:32:31 2024	(r22306)
+++ trunk/OpenMPT/build/make/config-mingw32crt.mk	Mon Nov 25 19:34:42 2024	(r22307)
@@ -103,11 +103,19 @@
 
 IS_CROSS=1
 
+ifeq ($(ALLOW_LGPL),1)
+LOCAL_ZLIB=1
+LOCAL_MPG123=1
+LOCAL_OGG=1
+LOCAL_VORBIS=1
+else
 NO_ZLIB=1
 NO_MPG123=1
 NO_OGG=1
 NO_VORBIS=1
 NO_VORBISFILE=1
+endif
+
 NO_PORTAUDIO=1
 NO_PORTAUDIOCPP=1
 NO_PULSEAUDIO=1