[OMPT-svn-commit] OpenMPT r22787 - branches/OpenMPT-1.30

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

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

Log:
Merged revision(s) 22783 from branches/OpenMPT-1.31:
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.30/   (props changed)
   branches/OpenMPT-1.30/Makefile

Modified: branches/OpenMPT-1.30/Makefile
==============================================================================
--- branches/OpenMPT-1.30/Makefile	Sat Jan  4 15:07:59 2025	(r22786)
+++ branches/OpenMPT-1.30/Makefile	Sat Jan  4 15:08:32 2025	(r22787)
@@ -510,7 +510,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