Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-24 06:50:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Makefiles for FFmpeg Opus (swresample.dll)

Browse Source
This commit is contained in:
bnnm 2017-09-24 19:14:19 +02:00
parent f25d559f68
commit c48a7236ca
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext_libs/Makefile.mingw
View File

@ -26,5 +26,8 @@ libavformat.a: avformat-vgmstream-57.dll avformat-vgmstream-57.def
libavutil.a: avutil-vgmstream-55.dll avutil-vgmstream-55.def libavutil.a: avutil-vgmstream-55.dll avutil-vgmstream-55.def
$(DLLTOOL) -D avutil-vgmstream-55.dll -d avutil-vgmstream-55.def -l libavutil.a $(DLLTOOL) -D avutil-vgmstream-55.dll -d avutil-vgmstream-55.def -l libavutil.a
libswresample.a: swresample-vgmstream-2.dll swresample-vgmstream-2.def
$(DLLTOOL) -D swresample-vgmstream-2.dll -d swresample-vgmstream-2.def -l libswresample.a
clean: clean:
rm -f libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a rm -f libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a libswresample.a

9
test/Makefile.mingw
View File

@ -2,7 +2,7 @@
VGM_ENABLE_FFMPEG=1 VGM_ENABLE_FFMPEG=1
ifeq ($(VGM_ENABLE_FFMPEG),1) ifeq ($(VGM_ENABLE_FFMPEG),1)
FFMPEG_CC=-DVGM_USE_FFMPEG FFMPEG_CC=-DVGM_USE_FFMPEG
FFMPEG_LD=-lavcodec -lavformat -lavutil FFMPEG_LD=-lavcodec -lavformat -lavutil -lswresample
endif endif
VGM_ENABLE_MAIATRAC3PLUS=0 VGM_ENABLE_MAIATRAC3PLUS=0
@ -31,9 +31,9 @@ export CC=i686-w64-mingw32-gcc
export AR=i686-w64-mingw32-ar export AR=i686-w64-mingw32-ar
export STRIP=i686-w64-mingw32-strip export STRIP=i686-w64-mingw32-strip
.PHONY: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a .PHONY: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a libswresample.a
test.exe: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a test.exe: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a libswresample.a
$(CC) $(CFLAGS) "-DVERSION=\"`../version.sh`\"" test.c $(LDFLAGS) -o test.exe $(CC) $(CFLAGS) "-DVERSION=\"`../version.sh`\"" test.c $(LDFLAGS) -o test.exe
$(STRIP) test.exe $(STRIP) test.exe
@ -64,5 +64,8 @@ libavformat.a:
libavutil.a: libavutil.a:
$(MAKE) -C ../ext_libs -f Makefile.mingw $@ $(MAKE) -C ../ext_libs -f Makefile.mingw $@
libswresample.a:
$(MAKE) -C ../ext_libs -f Makefile.mingw $@
clean: clean:
rm -f test.exe rm -f test.exe

9
winamp/Makefile
View File

@ -2,7 +2,7 @@
VGM_ENABLE_FFMPEG=1 VGM_ENABLE_FFMPEG=1
ifeq ($(VGM_ENABLE_FFMPEG),1) ifeq ($(VGM_ENABLE_FFMPEG),1)
FFMPEG_CC=-DVGM_USE_FFMPEG FFMPEG_CC=-DVGM_USE_FFMPEG
FFMPEG_LD=-lavcodec -lavformat -lavutil FFMPEG_LD=-lavcodec -lavformat -lavutil -lswresample
endif endif
VGM_ENABLE_MAIATRAC3PLUS=0 VGM_ENABLE_MAIATRAC3PLUS=0
@ -33,9 +33,9 @@ export WINDRES=i586-mingw32msvc-windres
#export STRIP=i686-w64-mingw32-strip #export STRIP=i686-w64-mingw32-strip
#export WINDRES=i686-w64-mingw32-windres #export WINDRES=i686-w64-mingw32-windres
.PHONY: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a .PHONY: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a libswresample.a
in_vgmstream.dll: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a resource.o in_vgmstream.dll: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a libswresample.a resource.o
$(CC) -shared -static-libgcc $(CFLAGS) "-DVERSION=\"`../version.sh`\"" in_vgmstream.c resource.o $(LDFLAGS) -o in_vgmstream.dll $(CC) -shared -static-libgcc $(CFLAGS) "-DVERSION=\"`../version.sh`\"" in_vgmstream.c resource.o $(LDFLAGS) -o in_vgmstream.dll
$(STRIP) in_vgmstream.dll $(STRIP) in_vgmstream.dll
@ -69,5 +69,8 @@ libavformat.a:
libavutil.a: libavutil.a:
$(MAKE) -C ../ext_libs -f Makefile.mingw $@ $(MAKE) -C ../ext_libs -f Makefile.mingw $@
libswresample.a:
$(MAKE) -C ../ext_libs -f Makefile.mingw $@
clean: clean:
rm -f in_vgmstream.dll resource.o rm -f in_vgmstream.dll resource.o

9
xmplay/Makefile
View File

@ -2,7 +2,7 @@
VGM_ENABLE_FFMPEG=1 VGM_ENABLE_FFMPEG=1
ifeq ($(VGM_ENABLE_FFMPEG),1) ifeq ($(VGM_ENABLE_FFMPEG),1)
FFMPEG_CC=-DVGM_USE_FFMPEG FFMPEG_CC=-DVGM_USE_FFMPEG
FFMPEG_LD=-lavcodec -lavformat -lavutil FFMPEG_LD=-lavcodec -lavformat -lavutil -lswresample
endif endif
VGM_ENABLE_MAIATRAC3PLUS=0 VGM_ENABLE_MAIATRAC3PLUS=0
@ -29,9 +29,9 @@ export AR=ar
export STRIP=strip export STRIP=strip
.PHONY: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a .PHONY: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a libswresample.a
xmp-vgmstream.dll: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a xmp-vgmstream.dll: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a libswresample.a
$(CC) -shared -static-libgcc $(CFLAGS) "-DVERSION=\"`../version.sh`\"" xmp_vgmstream.c $(LDFLAGS) -o xmp-vgmstream.dll xmpin.def $(CC) -shared -static-libgcc $(CFLAGS) "-DVERSION=\"`../version.sh`\"" xmp_vgmstream.c $(LDFLAGS) -o xmp-vgmstream.dll xmpin.def
$(STRIP) xmp-vgmstream.dll $(STRIP) xmp-vgmstream.dll
@ -62,5 +62,8 @@ libavformat.a:
libavutil.a: libavutil.a:
$(MAKE) -C ../ext_libs -f Makefile.mingw $@ $(MAKE) -C ../ext_libs -f Makefile.mingw $@
libswresample.a:
$(MAKE) -C ../ext_libs -f Makefile.mingw $@
clean: clean:
rm -f xmp-vgmstream.dll rm -f xmp-vgmstream.dll