Menu
▾
▴
[OMPT-svn-commit] OpenMPT r21548 - trunk/OpenMPT
|
From: <sv...@op...> - 2024-08-31 06:52:02
|
Author: manx Date: Sat Aug 31 08:51:53 2024 New Revision: 21548 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21548 Log: [Ref] build: Makefile: Start separate building external libraries. [Ref] build: Makefile: Show which subproject a particular file is compiled for. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Fri Aug 30 16:05:01 2024 (r21547) +++ trunk/OpenMPT/Makefile Sat Aug 31 08:51:53 2024 (r21548) @@ -647,24 +647,28 @@ LDFLAGS_ZLIB := LDLIBS_ZLIB := CPPFLAGS_ZLIB += -Iinclude/zlib/ -LOCAL_ZLIB_SOURCES := -LOCAL_ZLIB_SOURCES += include/zlib/adler32.c -LOCAL_ZLIB_SOURCES += include/zlib/compress.c -LOCAL_ZLIB_SOURCES += include/zlib/crc32.c -LOCAL_ZLIB_SOURCES += include/zlib/deflate.c -LOCAL_ZLIB_SOURCES += include/zlib/gzclose.c -LOCAL_ZLIB_SOURCES += include/zlib/gzlib.c -LOCAL_ZLIB_SOURCES += include/zlib/gzread.c -LOCAL_ZLIB_SOURCES += include/zlib/gzwrite.c -LOCAL_ZLIB_SOURCES += include/zlib/infback.c -LOCAL_ZLIB_SOURCES += include/zlib/inffast.c -LOCAL_ZLIB_SOURCES += include/zlib/inflate.c -LOCAL_ZLIB_SOURCES += include/zlib/inftrees.c -LOCAL_ZLIB_SOURCES += include/zlib/trees.c -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 +ZLIB_SOURCES := +ZLIB_SOURCES += include/zlib/adler32.c +ZLIB_SOURCES += include/zlib/compress.c +ZLIB_SOURCES += include/zlib/crc32.c +ZLIB_SOURCES += include/zlib/deflate.c +ZLIB_SOURCES += include/zlib/gzclose.c +ZLIB_SOURCES += include/zlib/gzlib.c +ZLIB_SOURCES += include/zlib/gzread.c +ZLIB_SOURCES += include/zlib/gzwrite.c +ZLIB_SOURCES += include/zlib/infback.c +ZLIB_SOURCES += include/zlib/inffast.c +ZLIB_SOURCES += include/zlib/inflate.c +ZLIB_SOURCES += include/zlib/inftrees.c +ZLIB_SOURCES += include/zlib/trees.c +ZLIB_SOURCES += include/zlib/uncompr.c +ZLIB_SOURCES += include/zlib/zutil.c +include/zlib/%.zlib$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DSTDC -DZ_HAVE_UNISTD_H +ZLIB_OBJECTS = $(ZLIB_SOURCES:.c=.zlib$(FLAVOUR_O).o) +ZLIB_DEPENDS = $(ZLIB_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) +ALL_OBJECTS += $(ZLIB_OBJECTS) +ALL_DEPENDS += $(ZLIB_DEPENDS) +OBJECTS_ZLIB = $(ZLIB_OBJECTS) else ifeq ($(NO_ZLIB),1) else @@ -720,24 +724,15 @@ MPG123_SOURCES += include/mpg123/src/libmpg123/synth_real.c MPG123_SOURCES += include/mpg123/src/libmpg123/synth_s32.c MPG123_SOURCES += include/mpg123/src/libmpg123/tabinit.c -MPG123_OBJECTS += $(MPG123_SOURCES:.c=$(FLAVOUR_O).o) +MPG123_OBJECTS += $(MPG123_SOURCES:.c=.mpg123$(FLAVOUR_O).o) MPG123_DEPENDS = $(MPG123_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) 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 := -LOCAL_MPG123_OBJECTS += -LOCAL_MPG123_LIBS := -LOCAL_MPG123_LIBS += bin/$(FLAVOUR_DIR)mpg123.a +include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC +include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC +include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +LIBS_MPG123 = bin/$(FLAVOUR_DIR)mpg123.a bin/$(FLAVOUR_DIR)mpg123.a: $(MPG123_OBJECTS) $(INFO) [DXE] $@ @@ -757,41 +752,42 @@ LDFLAGS_MPG123 := LDLIBS_MPG123 := CPPFLAGS_MPG123 += -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ -LOCAL_MPG123_SOURCES := -LOCAL_MPG123_SOURCES += include/mpg123/src/compat/compat.c -LOCAL_MPG123_SOURCES += include/mpg123/src/compat/compat_str.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/dct64.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/equalizer.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/feature.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/format.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/frame.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/icy.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/icy2utf8.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/id3.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/index.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/layer1.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/layer2.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/layer3.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/lfs_wrap.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/libmpg123.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/ntom.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/optimize.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/parse.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/readers.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/stringbuf.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/synth.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/synth_8bit.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/synth_real.c -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) +MPG123_SOURCES := +MPG123_SOURCES += include/mpg123/src/compat/compat.c +MPG123_SOURCES += include/mpg123/src/compat/compat_str.c +MPG123_SOURCES += include/mpg123/src/libmpg123/dct64.c +MPG123_SOURCES += include/mpg123/src/libmpg123/equalizer.c +MPG123_SOURCES += include/mpg123/src/libmpg123/feature.c +MPG123_SOURCES += include/mpg123/src/libmpg123/format.c +MPG123_SOURCES += include/mpg123/src/libmpg123/frame.c +MPG123_SOURCES += include/mpg123/src/libmpg123/icy.c +MPG123_SOURCES += include/mpg123/src/libmpg123/icy2utf8.c +MPG123_SOURCES += include/mpg123/src/libmpg123/id3.c +MPG123_SOURCES += include/mpg123/src/libmpg123/index.c +MPG123_SOURCES += include/mpg123/src/libmpg123/layer1.c +MPG123_SOURCES += include/mpg123/src/libmpg123/layer2.c +MPG123_SOURCES += include/mpg123/src/libmpg123/layer3.c +MPG123_SOURCES += include/mpg123/src/libmpg123/lfs_wrap.c +MPG123_SOURCES += include/mpg123/src/libmpg123/libmpg123.c +MPG123_SOURCES += include/mpg123/src/libmpg123/ntom.c +MPG123_SOURCES += include/mpg123/src/libmpg123/optimize.c +MPG123_SOURCES += include/mpg123/src/libmpg123/parse.c +MPG123_SOURCES += include/mpg123/src/libmpg123/readers.c +MPG123_SOURCES += include/mpg123/src/libmpg123/stringbuf.c +MPG123_SOURCES += include/mpg123/src/libmpg123/synth.c +MPG123_SOURCES += include/mpg123/src/libmpg123/synth_8bit.c +MPG123_SOURCES += include/mpg123/src/libmpg123/synth_real.c +MPG123_SOURCES += include/mpg123/src/libmpg123/synth_s32.c +MPG123_SOURCES += include/mpg123/src/libmpg123/tabinit.c +include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC +include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC +include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +MPG123_OBJECTS = $(MPG123_SOURCES:.c=.mpg123$(FLAVOUR_O).o) +MPG123_DEPENDS = $(MPG123_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) +ALL_OBJECTS += $(MPG123_OBJECTS) +ALL_DEPENDS += $(MPG123_DEPENDS) +OBJECTS_MPG123 = $(MPG123_OBJECTS) endif @@ -820,11 +816,15 @@ LDFLAGS_OGG := LDLIBS_OGG := CPPFLAGS_OGG += -Iinclude/ogg/include/ -Iinclude/ogg/ports/makefile/ -LOCAL_OGG_SOURCES := -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) +OGG_SOURCES := +OGG_SOURCES += include/ogg/src/bitwise.c +OGG_SOURCES += include/ogg/src/framing.c +include/ogg/src/%.ogg$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) +OGG_OBJECTS += $(OGG_SOURCES:.c=.ogg$(FLAVOUR_O).o) +OGG_DEPENDS = $(OGG_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) +ALL_OBJECTS += $(OGG_OBJECTS) +ALL_DEPENDS += $(OGG_DEPENDS) +OBJECTS_OGG = $(OGG_OBJECTS) else ifeq ($(NO_OGG),1) else @@ -853,31 +853,35 @@ ifneq ($(MPT_COMPILER_NOALLOCAH),1) CPPFLAGS_VORBIS += -DHAVE_ALLOCA_H endif -LOCAL_VORBIS_SOURCES := -LOCAL_VORBIS_SOURCES += include/vorbis/lib/analysis.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/bitrate.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/block.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/codebook.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/envelope.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/floor0.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/floor1.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/info.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/lookup.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/lpc.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/lsp.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/mapping0.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/mdct.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/psy.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/registry.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/res0.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/sharedbook.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/smallft.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/synthesis.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/vorbisenc.c -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) +VORBIS_SOURCES := +VORBIS_SOURCES += include/vorbis/lib/analysis.c +VORBIS_SOURCES += include/vorbis/lib/bitrate.c +VORBIS_SOURCES += include/vorbis/lib/block.c +VORBIS_SOURCES += include/vorbis/lib/codebook.c +VORBIS_SOURCES += include/vorbis/lib/envelope.c +VORBIS_SOURCES += include/vorbis/lib/floor0.c +VORBIS_SOURCES += include/vorbis/lib/floor1.c +VORBIS_SOURCES += include/vorbis/lib/info.c +VORBIS_SOURCES += include/vorbis/lib/lookup.c +VORBIS_SOURCES += include/vorbis/lib/lpc.c +VORBIS_SOURCES += include/vorbis/lib/lsp.c +VORBIS_SOURCES += include/vorbis/lib/mapping0.c +VORBIS_SOURCES += include/vorbis/lib/mdct.c +VORBIS_SOURCES += include/vorbis/lib/psy.c +VORBIS_SOURCES += include/vorbis/lib/registry.c +VORBIS_SOURCES += include/vorbis/lib/res0.c +VORBIS_SOURCES += include/vorbis/lib/sharedbook.c +VORBIS_SOURCES += include/vorbis/lib/smallft.c +VORBIS_SOURCES += include/vorbis/lib/synthesis.c +VORBIS_SOURCES += include/vorbis/lib/vorbisenc.c +VORBIS_SOURCES += include/vorbis/lib/vorbisfile.c +VORBIS_SOURCES += include/vorbis/lib/window.c +include/vorbis/lib/%.vorbis$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) +VORBIS_OBJECTS += $(VORBIS_SOURCES:.c=.vorbis$(FLAVOUR_O).o) +VORBIS_DEPENDS = $(VORBIS_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) +ALL_OBJECTS += $(VORBIS_OBJECTS) +ALL_DEPENDS += $(VORBIS_DEPENDS) +OBJECTS_VORBIS = $(VORBIS_OBJECTS) else ifeq ($(NO_VORBIS),1) else @@ -1091,15 +1095,67 @@ $(SILENT)$(COMPILE.c) $(OUTPUT_OPTION) $< %.test$(FLAVOUR_O).o: %.cpp - $(INFO) [CXX-TEST] $< + $(INFO) [CXX] libopenmpt-test: $< $(VERYSILENT)$(CXX) -DLIBOPENMPT_BUILD_TEST $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.test$(FLAVOUR_O).d $(SILENT)$(COMPILE.cc) -DLIBOPENMPT_BUILD_TEST $(OUTPUT_OPTION) $< %.test$(FLAVOUR_O).o: %.c - $(INFO) [CC-TEST] $< + $(INFO) [CC] libopenmpt-test: $< $(VERYSILENT)$(CC) -DLIBOPENMPT_BUILD_TEST $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.test$(FLAVOUR_O).d $(SILENT)$(COMPILE.c) -DLIBOPENMPT_BUILD_TEST $(OUTPUT_OPTION) $< +%.openmpt123$(FLAVOUR_O).o: %.cpp + $(INFO) [CXX] openmpt123: $< + $(VERYSILENT)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(CPPFLAGS_OPENMPT123) $(TARGET_ARCH) -M -MT$@ $< > $*.openmpt123$(FLAVOUR_O).d + $(SILENT)$(COMPILE.cc) $(CPPFLAGS_OPENMPT123) $(OUTPUT_OPTION) $< + +%.openmpt123$(FLAVOUR_O).o: %.c + $(INFO) [CC] openmpt123: $< + $(VERYSILENT)$(CC) $(CFLAGS) $(CPPFLAGS) $(CPPFLAGS_OPENMPT123) $(TARGET_ARCH) -M -MT$@ $< > $*.openmpt123$(FLAVOUR_O).d + $(SILENT)$(COMPILE.c) $(CPPFLAGS_OPENMPT123) $(OUTPUT_OPTION) $< + + +%.zlib$(FLAVOUR_O).o: %.cpp + $(INFO) [CXX] zlib: $< + $(VERYSILENT)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.zlib$(FLAVOUR_O).d + $(SILENT)$(COMPILE.cc) $(OUTPUT_OPTION) $< + +%.zlib$(FLAVOUR_O).o: %.c + $(INFO) [CC] zlib: $< + $(VERYSILENT)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.zlib$(FLAVOUR_O).d + $(SILENT)$(COMPILE.c) $(OUTPUT_OPTION) $< + +%.mpg123$(FLAVOUR_O).o: %.cpp + $(INFO) [CXX] mpg123: $< + $(VERYSILENT)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.mpg123$(FLAVOUR_O).d + $(SILENT)$(COMPILE.cc) $(OUTPUT_OPTION) $< + +%.mpg123$(FLAVOUR_O).o: %.c + $(INFO) [CC] mpg123: $< + $(VERYSILENT)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.mpg123$(FLAVOUR_O).d + $(SILENT)$(COMPILE.c) $(OUTPUT_OPTION) $< + +%.ogg$(FLAVOUR_O).o: %.cpp + $(INFO) [CXX] ogg: $< + $(VERYSILENT)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.ogg$(FLAVOUR_O).d + $(SILENT)$(COMPILE.cc) $(OUTPUT_OPTION) $< + +%.ogg$(FLAVOUR_O).o: %.c + $(INFO) [CC] ogg: $< + $(VERYSILENT)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.ogg$(FLAVOUR_O).d + $(SILENT)$(COMPILE.c) $(OUTPUT_OPTION) $< + +%.vorbis$(FLAVOUR_O).o: %.cpp + $(INFO) [CXX] vorbis: $< + $(VERYSILENT)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.vorbis$(FLAVOUR_O).d + $(SILENT)$(COMPILE.cc) $(OUTPUT_OPTION) $< + +%.vorbis$(FLAVOUR_O).o: %.c + $(INFO) [CC] vorbis: $< + $(VERYSILENT)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.vorbis$(FLAVOUR_O).d + $(SILENT)$(COMPILE.c) $(OUTPUT_OPTION) $< + + %.tar.gz: %.tar $(INFO) [GZIP] $< $(SILENT)gzip --rsyncable --no-name --best > $@ < $< @@ -1196,12 +1252,12 @@ $(SOUNDLIB_CXX_SOURCES) \ $(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) -LIBOPENMPT_OBJECTS += $(LOCAL_ZLIB_OBJECTS) +LIBOPENMPT_OBJECTS += $(OBJECTS_ZLIB) +LIBOPENMPTTEST_OBJECTS += $(OBJECTS_ZLIB) else ifeq ($(NO_ZLIB),1) ifeq ($(NO_MINIZ),1) @@ -1217,10 +1273,10 @@ 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) -LIBOPENMPT_OBJECTS += $(LOCAL_MPG123_OBJECTS) -LIBOPENMPT_LIBS += $(LOCAL_MPG123_LIBS) +LIBOPENMPT_OBJECTS += $(OBJECTS_MPG123) +LIBOPENMPTTEST_OBJECTS += $(OBJECTS_MPG123) +LIBOPENMPT_LIBS += $(LIBS_MPG123) +LIBOPENMPTTEST_LIBS += $(LIBS_MPG123) else ifeq ($(NO_MPG123),1) ifeq ($(NO_MINIMP3),1) @@ -1237,13 +1293,15 @@ 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) -LIBOPENMPTTEST_C_SOURCES += $(LOCAL_OGG_SOURCES) -LIBOPENMPT_OBJECTS += $(LOCAL_OGG_OBJECTS) -endif -LIBOPENMPT_C_SOURCES += $(LOCAL_VORBIS_SOURCES) -LIBOPENMPTTEST_C_SOURCES += $(LOCAL_VORBIS_SOURCES) -LIBOPENMPT_OBJECTS += $(LOCAL_VORBIS_OBJECTS) +LIBOPENMPT_OBJECTS += $(OBJECTS_OGG) +LIBOPENMPTTEST_OBJECTS += $(OBJECTS_OGG) +LIBOPENMPT_LIBS += $(LIBS_OGG) +LIBOPENMPTTEST_LIBS += $(LIBS_OGG) +endif +LIBOPENMPT_OBJECTS += $(OBJECTS_VORBIS) +LIBOPENMPTTEST_OBJECTS += $(OBJECTS_VORBIS) +LIBOPENMPT_LIBS += $(LIBS_VORBIS) +LIBOPENMPTTEST_LIBS += $(LIBS_VORBIS) else ifeq ($(NO_OGG),1) ifeq ($(NO_STBVORBIS),1) @@ -1318,7 +1376,7 @@ OPENMPT123_C_SOURCES += \ $(sort $(wildcard openmpt123/*.c)) \ -OPENMPT123_OBJECTS += $(OPENMPT123_CXX_SOURCES:.cpp=$(FLAVOUR_O).o) $(OPENMPT123_C_SOURCES:.c=$(FLAVOUR_O).o) +OPENMPT123_OBJECTS += $(OPENMPT123_CXX_SOURCES:.cpp=.openmpt123$(FLAVOUR_O).o) $(OPENMPT123_C_SOURCES:.c=.openmpt123$(FLAVOUR_O).o) OPENMPT123_DEPENDS = $(OPENMPT123_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) ALL_OBJECTS += $(OPENMPT123_OBJECTS) ALL_DEPENDS += $(OPENMPT123_DEPENDS) |
