[OMPT-svn-commit] OpenMPT r22783 - branches/OpenMPT-1.31

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

Author: manx
Date: Sat Jan  4 15:04:22 2025
New Revision: 22783
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22783

Log:
Merged revision(s) 22773 from trunk/OpenMPT:
[Mod] build: Makefile: mpg123: Use generic config.h.
........
Merged revision(s) 22778 from trunk/OpenMPT:
[Fix] build: Makefile: Copy-paste-typo in r22773 broke ogg build.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/Makefile

Modified: branches/OpenMPT-1.31/Makefile
==============================================================================
--- branches/OpenMPT-1.31/Makefile	Sat Jan  4 15:02:27 2025	(r22782)
+++ branches/OpenMPT-1.31/Makefile	Sat Jan  4 15:04:22 2025	(r22783)
@@ -712,7 +712,7 @@
 CPPFLAGS_MPG123 := -DMPT_WITH_MPG123 -DMPG123_NO_LARGENAME
 LDFLAGS_MPG123  := 
 LDLIBS_MPG123   := 
-CPPFLAGS_MPG123 += -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/
+CPPFLAGS_MPG123 += -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/
 LOCAL_MPG123_SOURCES := 
 LOCAL_MPG123_SOURCES += include/mpg123/src/compat/compat.c
 LOCAL_MPG123_SOURCES += include/mpg123/src/compat/compat_str.c