Use i686 instead of i586 in Makefile and use LF in version.sh

This commit is contained in:
libertyernie 2015-08-30 13:47:35 -05:00
parent 1cdb67dd88
commit 2e28098b95
2 changed files with 8 additions and 8 deletions

View File

@ -1,6 +1,6 @@
export SHELL = /bin/sh
export DLLTOOL=i586-mingw32msvc-dlltool
#export DLLTOOL=i686-w64-mingw32-dlltool
#export DLLTOOL=i586-mingw32msvc-dlltool
export DLLTOOL=i686-w64-mingw32-dlltool
libvorbis.a: libvorbis.def
$(DLLTOOL) -d libvorbis.def -l libvorbis.a

View File

@ -1,12 +1,12 @@
export SHELL = /bin/sh
export CFLAGS=-Wall -O3 -DVGM_USE_G7221 -DVGM_USE_G719 -DVGM_USE_MAIATRAC3PLUS -DVAR_ARRAYS -I../ext_includes
export LDFLAGS=-L../src -L../ext_libs -lvgmstream -lvorbis -lmpg123-0 -lg7221_decode -lg719_decode -lat3plusdecoder -lm
export CC=i586-mingw32msvc-gcc
export AR=i586-mingw32msvc-ar
export STRIP=i586-mingw32msvc-strip
#export CC=i686-w64-mingw32-gcc
#export AR=i686-w64-mingw32-ar
#export STRIP=i686-w64-mingw32-strip
#export CC=i586-mingw32msvc-gcc
#export AR=i586-mingw32msvc-ar
#export STRIP=i586-mingw32msvc-strip
export CC=i686-w64-mingw32-gcc
export AR=i686-w64-mingw32-ar
export STRIP=i686-w64-mingw32-strip
.PHONY: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a