[OMPT-svn-commit] OpenMPT r21547 - trunk/OpenMPT

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

Author: manx
Date: Fri Aug 30 16:05:01 2024
New Revision: 21547
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21547

Log:
Revert r21545, r21540. These were not redundant currently.
Merged revision(s) 21545, 21540 from trunk/OpenMPT:
[Ref] Makefile: Remove redundant options for 3rd party libraries.
........
[Ref] Makefile: Remove redundant options for 3rd party libraries.
........

Modified:
   trunk/OpenMPT/Makefile

Modified: trunk/OpenMPT/Makefile
==============================================================================
--- trunk/OpenMPT/Makefile	Fri Aug 30 15:42:45 2024	(r21546)
+++ trunk/OpenMPT/Makefile	Fri Aug 30 16:05:01 2024	(r21547)
@@ -664,6 +664,7 @@
 LOCAL_ZLIB_SOURCES += include/zlib/uncompr.c
 LOCAL_ZLIB_SOURCES += include/zlib/zutil.c
 include/zlib/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DSTDC -DZ_HAVE_UNISTD_H
+include/zlib/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DSTDC -DZ_HAVE_UNISTD_H
 else
 ifeq ($(NO_ZLIB),1)
 else
@@ -724,9 +725,13 @@
 ALL_OBJECTS += $(MPG123_OBJECTS)
 ALL_DEPENDS += $(MPG123_DEPENDS)
 include/mpg123/src/compat/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
+include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
 include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
+include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).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)
 LOCAL_MPG123_SOURCES :=
 LOCAL_MPG123_SOURCES +=
 LOCAL_MPG123_OBJECTS :=
@@ -780,9 +785,13 @@
 LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/synth_s32.c
 LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/tabinit.c
 include/mpg123/src/compat/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
+include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
 include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
+include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).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)
 
 endif
 
@@ -815,6 +824,7 @@
 LOCAL_OGG_SOURCES += include/ogg/src/bitwise.c
 LOCAL_OGG_SOURCES += include/ogg/src/framing.c
 include/ogg/src/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT)
+include/ogg/src/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT)
 else
 ifeq ($(NO_OGG),1)
 else
@@ -867,6 +877,7 @@
 LOCAL_VORBIS_SOURCES += include/vorbis/lib/vorbisfile.c
 LOCAL_VORBIS_SOURCES += include/vorbis/lib/window.c
 include/vorbis/lib/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT)
+include/vorbis/lib/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT)
 else
 ifeq ($(NO_VORBIS),1)
 else
@@ -1186,6 +1197,7 @@
  $(sort $(wildcard libopenmpt/*.cpp)) \
  
 include/miniz/miniz$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT)
+include/miniz/miniz.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT)
 ifeq ($(LOCAL_ZLIB),1)
 LIBOPENMPT_C_SOURCES += $(LOCAL_ZLIB_SOURCES)
 LIBOPENMPTTEST_C_SOURCES += $(LOCAL_ZLIB_SOURCES)
@@ -1203,6 +1215,7 @@
 endif
 
 include/minimp3/minimp3$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT)
+include/minimp3/minimp3.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT)
 ifeq ($(LOCAL_MPG123),1)
 LIBOPENMPT_C_SOURCES += $(LOCAL_MPG123_SOURCES)
 LIBOPENMPTTEST_C_SOURCES += $(LOCAL_MPG123_SOURCES)
@@ -1221,6 +1234,7 @@
 endif
 
 include/stb_vorbis/stb_vorbis$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT)
+include/stb_vorbis/stb_vorbis.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT)
 ifeq ($(LOCAL_VORBIS),1)
 ifeq ($(LOCAL_OGG),1)
 LIBOPENMPT_C_SOURCES += $(LOCAL_OGG_SOURCES)