From c20e9fd6bd17038bbf7921184c5485180543f41e Mon Sep 17 00:00:00 2001 From: twinaphex <libretro@gmail.com> Date: Wed, 23 Mar 2016 18:54:17 +0100 Subject: [PATCH] Start updating audio/test/Makefile --- audio/test/Makefile | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/audio/test/Makefile b/audio/test/Makefile index 444d99ce58..771d0de753 100644 --- a/audio/test/Makefile +++ b/audio/test/Makefile @@ -22,20 +22,17 @@ LDFLAGS += -lm SHAREDOBJ += $(LIBRETRO_COMM_DIR)/memmap/memalign.o \ $(LIBRETRO_COMM_DIR)/lists/string_list.o \ ../..//config_file_userdata.o \ + ../audio_resampler_driver.o \ $(LIBRETRO_COMM_DIR)/file/config_file.o \ $(LIBRETRO_COMM_DIR)/streams/file_stream.o \ + $(LIBRETRO_COMM_DIR)/string/stdstring.o \ $(LIBRETRO_COMM_DIR)/file/file_path.o \ - $(LIBRETRO_COMM_DIR)/compat/compat.o \ + $(LIBRETRO_COMM_DIR)/file/retro_stat.o \ + $(LIBRETRO_COMM_DIR)/compat/compat_strl.o \ $(LIBRETRO_COMM_DIR)/hash/rhash.o \ all: $(TESTS) -resampler-sinc.o: ../audio_resampler_driver.c $(SHAREDOBJ) - $(CC) -c -o $@ $< $(CFLAGS) - -resampler-cc.o: ../audio_resampler_driver.c $(SHAREDOBJ) - $(CC) -c -o $@ $< $(CFLAGS) -DRESAMPLER_IDENT='"CC"' - main-cc.o: main.c $(CC) -c -o $@ $< $(CFLAGS) -DRESAMPLER_IDENT='"CC"' @@ -45,16 +42,16 @@ snr-cc.o: snr.c cc-resampler.o: ../drivers_resampler/cc_resampler.c $(CC) -c -o $@ $< $(CFLAGS) -sinc-lowest.o: ../drivers_resampler/sinc.c +sinc-lowest.o: ../drivers_resampler/sinc_resampler.c $(CC) -c -o $@ $< $(CFLAGS) -DSINC_LOWEST_QUALITY -sinc-lower.o: ../drivers_resampler/sinc.c +sinc-lower.o: ../drivers_resampler/sinc_resampler.c $(CC) -c -o $@ $< $(CFLAGS) -DSINC_LOWER_QUALITY -sinc.o: ../drivers_resampler/sinc.c +sinc.o: ../drivers_resampler/sinc_resampler.c $(CC) -c -o $@ $< $(CFLAGS) -nearest.o: ../drivers_resampler/nearest.c +nearest_resampler.o: ../drivers_resampler/nearest_resampler.c $(CC) -c -o $@ $< $(CFLAGS) sinc-higher.o: ../drivers_resampler/sinc.c @@ -63,40 +60,40 @@ sinc-higher.o: ../drivers_resampler/sinc.c sinc-highest.o: ../drivers_resampler/sinc.c $(CC) -c -o $@ $< $(CFLAGS) -DSINC_HIGHEST_QUALITY -test-sinc-lowest: sinc-lowest.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ) +test-sinc-lowest: sinc-lowest.o ../audio_utils.o main.o nearest_resampler.o $(SHAREDOBJ) $(CC) -o $@ $^ $(LDFLAGS) -test-snr-sinc-lowest: sinc-lowest.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ) +test-snr-sinc-lowest: sinc-lowest.o ../audio_utils.o snr.o nearest_resampler.o $(SHAREDOBJ) $(CC) -o $@ $^ $(LDFLAGS) -test-sinc-lower: sinc-lower.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ) +test-sinc-lower: sinc-lower.o ../audio_utils.o main.o nearest_resampler.o $(SHAREDOBJ) $(CC) -o $@ $^ $(LDFLAGS) -test-snr-sinc-lower: sinc-lower.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ) +test-snr-sinc-lower: sinc-lower.o ../audio_utils.o snr.o nearest_resampler.o $(SHAREDOBJ) $(CC) -o $@ $^ $(LDFLAGS) -test-sinc: sinc.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ) +test-sinc: sinc.o ../audio_utils.o main.o nearest_resampler.o $(SHAREDOBJ) $(CC) -o $@ $^ $(LDFLAGS) -test-snr-sinc: sinc.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ) +test-snr-sinc: sinc.o ../audio_utils.o snr.o nearest_resampler.o $(SHAREDOBJ) $(CC) -o $@ $^ $(LDFLAGS) -test-sinc-higher: sinc-higher.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ) +test-sinc-higher: sinc-higher.o ../audio_utils.o main.o nearest_resampler.o $(SHAREDOBJ) $(CC) -o $@ $^ $(LDFLAGS) -test-snr-sinc-higher: sinc-higher.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ) +test-snr-sinc-higher: sinc-higher.o ../audio_utils.o snr.o nearest_resampler.o $(SHAREDOBJ) $(CC) -o $@ $^ $(LDFLAGS) -test-sinc-highest: sinc-highest.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ) +test-sinc-highest: sinc-highest.o ../audio_utils.o main.o nearest_resampler.o $(SHAREDOBJ) $(CC) -o $@ $^ $(LDFLAGS) -test-snr-sinc-highest: sinc-highest.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ) +test-snr-sinc-highest: sinc-highest.o ../audio_utils.o snr.o nearest_resampler.o $(SHAREDOBJ) $(CC) -o $@ $^ $(LDFLAGS) -test-cc: cc-resampler.o ../audio_utils.o main-cc.o resampler-cc.o resampler-cc.o sinc.o nearest.o $(SHAREDOBJ) +test-cc: cc-resampler.o ../audio_utils.o main-cc.o resampler-cc.o sinc.o nearest_resampler.o $(SHAREDOBJ) $(CC) -o $@ $^ $(LDFLAGS) -test-snr-cc: cc-resampler.o ../audio_utils.o snr-cc.o resampler-cc.o sinc.o nearest.o $(SHAREDOBJ) +test-snr-cc: cc-resampler.o ../audio_utils.o snr-cc.o resampler-cc.o sinc.o nearest_resampler.o $(SHAREDOBJ) $(CC) -o $@ $^ $(LDFLAGS) %.o: %.c