[OMPT-svn-commit] OpenMPT r22804 - branches/OpenMPT-1.29

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

Author: manx
Date: Sat Jan  4 17:11:20 2025
New Revision: 22804
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22804

Log:
Merged revision(s) 22802 from branches/OpenMPT-1.31:
[Fix] build: Makefile: mpg123: Compile fix for r22783.
........

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

Modified: branches/OpenMPT-1.29/Makefile
==============================================================================
--- branches/OpenMPT-1.29/Makefile	Sat Jan  4 17:10:55 2025	(r22803)
+++ branches/OpenMPT-1.29/Makefile	Sat Jan  4 17:11:20 2025	(r22804)
@@ -493,10 +493,10 @@
 include/mpg123/src/compat/%.test.o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
 include/mpg123/src/libmpg123/%.o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
 include/mpg123/src/libmpg123/%.test.o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
-include/mpg123/src/compat/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
-include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
-include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
-include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
+include/mpg123/src/compat/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ $(CPPFLAGS)
+include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ $(CPPFLAGS)
+include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ $(CPPFLAGS)
+include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ $(CPPFLAGS)
 else
 ifeq ($(NO_MPG123),1)
 else