From 61db7c59917f9912923f0fbc7fa8412bc87e5416 Mon Sep 17 00:00:00 2001 From: halleyscometsw Date: Sun, 15 Jun 2008 11:03:43 +0000 Subject: [PATCH] use vorbisfile.dll (which needs ogg.dll and vorbis.dll) instead of libvorbis.dll; the former set comes with Winamp's vorbis decoder git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@246 51a99a44-fe44-0410-b1ba-c3e57ba2b86b --- ext_libs/Makefile.mingw | 6 +- ext_libs/ext_libs.vcproj | 10 +-- ext_libs/libvorbis.def | 146 ------------------------------------- ext_libs/vorbisfile.def | 39 ++++++++++ test/Makefile | 2 +- test/Makefile.mingw | 8 +- winamp/Makefile | 10 +-- winamp/in_vgmstream.vcproj | 4 +- 8 files changed, 59 insertions(+), 166 deletions(-) delete mode 100644 ext_libs/libvorbis.def create mode 100644 ext_libs/vorbisfile.def diff --git a/ext_libs/Makefile.mingw b/ext_libs/Makefile.mingw index 4991a176..8ff9870e 100644 --- a/ext_libs/Makefile.mingw +++ b/ext_libs/Makefile.mingw @@ -1,8 +1,8 @@ export SHELL = /bin/sh export DLLTOOL=i586-mingw32msvc-dlltool -libvorbis.a: libvorbis.def - $(DLLTOOL) -d libvorbis.def -l libvorbis.a +libvorbisfile.a: vorbisfile.def + $(DLLTOOL) -d vorbisfile.def -l libvorbisfile.a clean: - rm -f libvorbis.a + rm -f libvorbisfile.a diff --git a/ext_libs/ext_libs.vcproj b/ext_libs/ext_libs.vcproj index 1e30bf2c..72dced89 100644 --- a/ext_libs/ext_libs.vcproj +++ b/ext_libs/ext_libs.vcproj @@ -59,7 +59,7 @@ diff --git a/ext_libs/libvorbis.def b/ext_libs/libvorbis.def deleted file mode 100644 index fbb3052d..00000000 --- a/ext_libs/libvorbis.def +++ /dev/null @@ -1,146 +0,0 @@ -LIBRARY libvorbis.dll -EXPORTS -_analysis_output_always -_floor_P -_mapping_P -_residue_P -libvorbis_date -ogg_packet_clear -ogg_page_bos -ogg_page_checksum_set -ogg_page_continued -ogg_page_eos -ogg_page_granulepos -ogg_page_packets -ogg_page_pageno -ogg_page_serialno -ogg_page_version -ogg_stream_clear -ogg_stream_destroy -ogg_stream_eos -ogg_stream_flush -ogg_stream_init -ogg_stream_packetin -ogg_stream_packetout -ogg_stream_packetpeek -ogg_stream_pagein -ogg_stream_pageout -ogg_stream_reset -ogg_stream_reset_serialno -ogg_sync_buffer -ogg_sync_clear -ogg_sync_destroy -ogg_sync_init -ogg_sync_pageout -ogg_sync_pageseek -ogg_sync_reset -ogg_sync_wrote -oggpackB_adv -oggpackB_adv1 -oggpackB_bits -oggpackB_bytes -oggpackB_get_buffer -oggpackB_look -oggpackB_look1 -oggpackB_read -oggpackB_read1 -oggpackB_readinit -oggpackB_reset -oggpackB_write -oggpackB_writealign -oggpackB_writeclear -oggpackB_writecopy -oggpackB_writeinit -oggpackB_writetrunc -oggpack_adv -oggpack_adv1 -oggpack_bits -oggpack_bytes -oggpack_get_buffer -oggpack_look -oggpack_look1 -oggpack_read -oggpack_read1 -oggpack_readinit -oggpack_reset -oggpack_write -oggpack_writealign -oggpack_writeclear -oggpack_writecopy -oggpack_writeinit -oggpack_writetrunc -ov_bitrate -ov_bitrate_instant -ov_clear -ov_comment -ov_crosslap -ov_halfrate -ov_halfrate_p -ov_info -ov_open -ov_open_callbacks -ov_pcm_seek -ov_pcm_seek_lap -ov_pcm_seek_page -ov_pcm_seek_page_lap -ov_pcm_tell -ov_pcm_total -ov_raw_seek -ov_raw_seek_lap -ov_raw_tell -ov_raw_total -ov_read -ov_read_float -ov_seekable -ov_serialnumber -ov_streams -ov_test -ov_test_callbacks -ov_test_open -ov_time_seek -ov_time_seek_lap -ov_time_seek_page -ov_time_seek_page_lap -ov_time_tell -ov_time_total -vorbis_analysis -vorbis_analysis_blockout -vorbis_analysis_buffer -vorbis_analysis_headerout -vorbis_analysis_init -vorbis_analysis_wrote -vorbis_bitrate_addblock -vorbis_bitrate_flushpacket -vorbis_block_clear -vorbis_block_init -vorbis_comment_add -vorbis_comment_add_tag -vorbis_comment_clear -vorbis_comment_init -vorbis_comment_query -vorbis_comment_query_count -vorbis_commentheader_out -vorbis_dsp_clear -vorbis_encode_ctl -vorbis_encode_init -vorbis_encode_init_vbr -vorbis_encode_setup_init -vorbis_encode_setup_managed -vorbis_encode_setup_vbr -vorbis_granule_time -vorbis_info_blocksize -vorbis_info_clear -vorbis_info_init -vorbis_packet_blocksize -vorbis_synthesis -vorbis_synthesis_blockin -vorbis_synthesis_halfrate -vorbis_synthesis_halfrate_p -vorbis_synthesis_headerin -vorbis_synthesis_init -vorbis_synthesis_lapout -vorbis_synthesis_pcmout -vorbis_synthesis_read -vorbis_synthesis_restart -vorbis_synthesis_trackonly -vorbis_window diff --git a/ext_libs/vorbisfile.def b/ext_libs/vorbisfile.def new file mode 100644 index 00000000..5cdd7038 --- /dev/null +++ b/ext_libs/vorbisfile.def @@ -0,0 +1,39 @@ +; +; vorbisfile.def +; +LIBRARY vorbisfile.dll +EXPORTS +ov_clear +ov_open +ov_open_callbacks +ov_bitrate +ov_bitrate_instant +ov_streams +ov_seekable +ov_serialnumber +ov_raw_total +ov_pcm_total +ov_time_total +ov_raw_seek +ov_pcm_seek +ov_pcm_seek_page +ov_time_seek +ov_time_seek_page +ov_raw_seek_lap +ov_pcm_seek_lap +ov_pcm_seek_page_lap +ov_time_seek_lap +ov_time_seek_page_lap +ov_raw_tell +ov_pcm_tell +ov_time_tell +ov_info +ov_comment +ov_read +ov_read_float +ov_test +ov_test_callbacks +ov_test_open +ov_crosslap +ov_halfrate +ov_halfrate_p diff --git a/test/Makefile b/test/Makefile index c2cfbca2..4e341df4 100644 --- a/test/Makefile +++ b/test/Makefile @@ -3,7 +3,7 @@ export CFLAGS=-Wall -O3 export LDFLAGS=-lm -L../src -lvgmstream -lvorbisfile export STRIP=strip -.PHONY: libvgmstream.a +.PHONY: libvgmstream.a libvorbisfile.a test: libvgmstream.a test.o $(CC) test.o $(LDFLAGS) $(CFLAGS) -o test diff --git a/test/Makefile.mingw b/test/Makefile.mingw index e7e51038..a2be2930 100644 --- a/test/Makefile.mingw +++ b/test/Makefile.mingw @@ -1,20 +1,20 @@ export SHELL = /bin/sh export CFLAGS=-Wall -O3 -I../ext_includes -export LDFLAGS=-lm -L../src -L../ext_libs -lvgmstream -lvorbis +export LDFLAGS=-lm -L../src -L../ext_libs -lvgmstream -lvorbisfile export CC=i586-mingw32msvc-gcc export AR=i586-mingw32msvc-ar export STRIP=i586-mingw32msvc-strip -.PHONY: libvgmstream.a libvorbis.a +.PHONY: libvgmstream.a libvorbisfile.a -test.exe: libvgmstream.a libvorbis.a +test.exe: libvgmstream.a libvorbisfile.a $(CC) $(CFLAGS) "-DVERSION=\"`../version.sh`\"" test.c $(LDFLAGS) -o test.exe $(STRIP) test.exe libvgmstream.a: $(MAKE) -C ../src $@ -libvorbis.a: +libvorbisfile.a: $(MAKE) -C ../ext_libs -f Makefile.mingw $@ clean: diff --git a/winamp/Makefile b/winamp/Makefile index 5507afb5..764b2771 100644 --- a/winamp/Makefile +++ b/winamp/Makefile @@ -1,14 +1,14 @@ export SHELL = /bin/sh export CFLAGS=-Wall -O3 -I../ext_includes -export LDFLAGS=-lm -L../src -L../ext_libs -lvgmstream -lvorbis +export LDFLAGS=-lm -L../src -L../ext_libs -lvgmstream -lvorbisfile export CC=i586-mingw32msvc-gcc export AR=i586-mingw32msvc-ar export STRIP=i586-mingw32msvc-strip export WINDRES=i586-mingw32msvc-windres -.PHONY: libvgmstream.a libvorbis.a +.PHONY: libvgmstream.a libvorbisfile.a -in_vgmstream.dll: libvgmstream.a libvorbis.a in_vgmstream.c resource.o +in_vgmstream.dll: libvgmstream.a libvorbisfile.a in_vgmstream.c resource.o $(CC) -shared $(CFLAGS) "-DVERSION=\"`../version.sh`\"" in_vgmstream.c resource.o $(LDFLAGS) -o in_vgmstream.dll $(STRIP) in_vgmstream.dll @@ -18,8 +18,8 @@ resource.o: resource.rc resource.h libvgmstream.a: $(MAKE) -C ../src libvgmstream.a -libvorbis.a: - $(MAKE) -C ../ext_libs -f Makefile.mingw libvorbis.a +libvorbisfile.a: + $(MAKE) -C ../ext_libs -f Makefile.mingw libvorbisfile.a clean: rm -f in_vgmstream.dll resource.o diff --git a/winamp/in_vgmstream.vcproj b/winamp/in_vgmstream.vcproj index eb0bbc3c..618b8903 100644 --- a/winamp/in_vgmstream.vcproj +++ b/winamp/in_vgmstream.vcproj @@ -60,7 +60,7 @@ />