Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-06 14:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update FFmpeg path; add flag to disable MPEG

Browse Source 
Also FFMPEG_ACCURATE_LOOP added until some crash issues with MPEG are
fixed
This commit is contained in:
bnnm 2016-11-27 16:14:19 +01:00
parent 69116cb6ad
commit 4ad87a0b77
2 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
test/Makefile.mingw
View File

@ -1,20 +1,29 @@
# optional parts # optional parts
export ENABLE_FFMPEG=0 VGM_ENABLE_FFMPEG=0
ifeq ($(ENABLE_FFMPEG),1) ifeq ($(VGM_ENABLE_FFMPEG),1)
export FFMPEG_CC=-DVGM_USE_FFMPEG -I../../ffmpeg-dev/include FFMPEG_CC=-DVGM_USE_FFMPEG -DVGM_USE_FFMPEG_ACCURATE_LOOPING -I../../vgmstream-ffmpeg/include
export FFMPEG_LD=-L../../ffmpeg-dev/lib -lavcodec -lavformat -lavutil FFMPEG_LD=-L../../vgmstream-ffmpeg/lib -lavcodec -lavformat -lavutil
endif endif
export ENABLE_MAIATRAC3PLUS=1 VGM_ENABLE_MAIATRAC3PLUS=1
ifeq ($(ENABLE_MAIATRAC3PLUS),1) ifeq ($(VGM_ENABLE_MAIATRAC3PLUS),1)
export MAT3P_CC=-DVGM_USE_MAIATRAC3PLUS MAT3P_CC=-DVGM_USE_MAIATRAC3PLUS
export MAT3P_LD=-lat3plusdecoder MAT3P_LD=-lat3plusdecoder
endif endif
#MPEG_CC=-DVGM_USE_MPEG
MPEG_LD=-lmpg123-0
VGM_DISABLE_MPEG=0
ifeq ($(VGM_DISABLE_MPEG),1)
MPEG_CC=-DVGM_DISABLE_MPEG
MPEG_LD=
endif
# config # config
export SHELL = /bin/sh export SHELL = /bin/sh
export CFLAGS=-Wall -O3 -DVGM_USE_G7221 -DVGM_USE_G719 $(MAT3P_CC) -DVAR_ARRAYS -I../ext_includes $(FFMPEG_CC) export CFLAGS=-Wall -O3 $(MPEG_CC) -DVGM_USE_G7221 -DVGM_USE_G719 $(MAT3P_CC) -DVAR_ARRAYS -I../ext_includes $(FFMPEG_CC)
export LDFLAGS=-L../src -L../ext_libs -lvgmstream -lvorbis -lmpg123-0 -lg7221_decode -lg719_decode $(MAT3P_LD) -lm $(FFMPEG_LD) export LDFLAGS=-L../src -L../ext_libs -lvgmstream -lvorbis $(MPEG_LD) -lg7221_decode -lg719_decode $(MAT3P_LD) -lm $(FFMPEG_LD)
#export CC=i586-mingw32msvc-gcc #export CC=i586-mingw32msvc-gcc
#export AR=i586-mingw32msvc-ar #export AR=i586-mingw32msvc-ar
#export STRIP=i586-mingw32msvc-strip #export STRIP=i586-mingw32msvc-strip

30
winamp/Makefile
View File

@ -1,25 +1,33 @@
# optional parts # optional parts
export ENABLE_FFMPEG=0 VGM_ENABLE_FFMPEG=0
ifeq ($(ENABLE_FFMPEG),1) ifeq ($(VGM_ENABLE_FFMPEG),1)
export FFMPEG_CC=-DVGM_USE_FFMPEG -I../../ffmpeg-dev/include FFMPEG_CC=-DVGM_USE_FFMPEG -DVGM_USE_FFMPEG_ACCURATE_LOOPING -I../../vgmstream-ffmpeg/include
export FFMPEG_LD=-L../../ffmpeg-dev/lib -lavcodec -lavformat -lavutil FFMPEG_LD=-L../../vgmstream-ffmpeg/lib -lavcodec -lavformat -lavutil
endif endif
export ENABLE_MAIATRAC3PLUS=1 VGM_ENABLE_MAIATRAC3PLUS=1
ifeq ($(ENABLE_MAIATRAC3PLUS),1) ifeq ($(VGM_ENABLE_MAIATRAC3PLUS),1)
export MAT3P_CC=-DVGM_USE_MAIATRAC3PLUS MAT3P_CC=-DVGM_USE_MAIATRAC3PLUS
export MAT3P_LD=-lat3plusdecoder MAT3P_LD=-lat3plusdecoder
endif endif
#MPEG_CC=-DVGM_USE_MPEG
MPEG_LD=-lmpg123-0
VGM_DISABLE_MPEG=0
ifeq ($(VGM_DISABLE_MPEG),1)
MPEG_CC=-DVGM_DISABLE_MPEG
MPEG_LD=
endif
# config # config
export SHELL = /bin/sh export SHELL = /bin/sh
export CFLAGS=-Wall -O3 -DVGM_USE_G7221 -DVGM_USE_G719 $(MAT3P_CC) -DWIN32 -DUSE_ALLOCA -I../ext_includes $(FFMPEG_CC) export CFLAGS=-Wall -O3 $(MPEG_CC) -DVGM_USE_G7221 -DVGM_USE_G719 $(MAT3P_CC) -DWIN32 -DUSE_ALLOCA -I../ext_includes $(FFMPEG_CC)
export LDFLAGS=-L../src -L../ext_libs -lvgmstream -lvorbis -lmpg123-0 -lg7221_decode -lg719_decode $(MAT3P_LD) -lm $(FFMPEG_LD) export LDFLAGS=-L../src -L../ext_libs -lvgmstream -lvorbis $(MPEG_LD) -lg7221_decode -lg719_decode $(MAT3P_LD) -lm $(FFMPEG_LD)
export CC=i586-mingw32msvc-gcc export CC=i586-mingw32msvc-gcc
export AR=i586-mingw32msvc-ar export AR=i586-mingw32msvc-ar
export STRIP=i586-mingw32msvc-strip export STRIP=i586-mingw32msvc-strip
export WINDRES=i586-mingw32msvc-windres export WINDRES=i586-mingw32msvc-windres
#export CC=i686-w64-mingw32-gcc #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