Only enable SINC by default for 64-bit Windows.

This commit is contained in:
Themaister 2012-02-28 19:28:06 +01:00
parent fd99d9f3bc
commit 7b0b1a7004
2 changed files with 7 additions and 8 deletions

View File

@ -25,7 +25,6 @@ ifeq ($(SLIM),)
HAVE_CG = 1 HAVE_CG = 1
HAVE_PYTHON = 1 HAVE_PYTHON = 1
HAVE_FFMPEG = 1 HAVE_FFMPEG = 1
HAVE_SINC = 1
endif endif
libsnes ?= -lsnes libsnes ?= -lsnes
@ -142,7 +141,6 @@ endif
ifeq ($(HAVE_SINC), 1) ifeq ($(HAVE_SINC), 1)
OBJ += audio/sinc.o OBJ += audio/sinc.o
CFLAGS += -msse
else else
OBJ += audio/hermite.o OBJ += audio/hermite.o
endif endif

View File

@ -81,6 +81,7 @@ do_build()
SSNES_DIR="$1" SSNES_DIR="$1"
LIBZIPNAME="$2" LIBZIPNAME="$2"
BUILDTYPE="$3" BUILDTYPE="$3"
MAKEARGS="$4"
if [ ! -d "$SSNES_DIR" ]; then if [ ! -d "$SSNES_DIR" ]; then
git clone git://github.com/Themaister/SSNES.git "$SSNES_DIR" git clone git://github.com/Themaister/SSNES.git "$SSNES_DIR"
@ -95,8 +96,8 @@ do_build()
fi fi
make -f Makefile.win clean || die "Failed to clean ..." make -f Makefile.win clean || die "Failed to clean ..."
make -f Makefile.win CC="$C_COMPILER" CXX="$CXX_COMPILER" -j4 all SLIM=1 || die "Failed to build ..." make -f Makefile.win $MAKEARGS CC="$C_COMPILER" CXX="$CXX_COMPILER" -j4 all SLIM=1 || die "Failed to build ..."
make -f Makefile.win CC="$C_COMPILER" CXX="$CXX_COMPILER" dist_${BUILDTYPE} SLIM=1 || die "Failed to dist ..." make -f Makefile.win $MAKEARGS CC="$C_COMPILER" CXX="$CXX_COMPILER" dist_${BUILDTYPE} SLIM=1 || die "Failed to dist ..."
if [ -z "`find . | grep "ssnes-win"`" ]; then if [ -z "`find . | grep "ssnes-win"`" ]; then
die "Did not find build ..." die "Did not find build ..."
fi fi
@ -115,8 +116,8 @@ do_build()
mv -v "$ZIP_BASE" "../$ZIP_SLIM" || die "Failed to move final build ..." mv -v "$ZIP_BASE" "../$ZIP_SLIM" || die "Failed to move final build ..."
make -f Makefile.win clean || die "Failed to clean ..." make -f Makefile.win clean || die "Failed to clean ..."
make -f Makefile.win CC="$C_COMPILER" CXX="$CXX_COMPILER" -j4 all || die "Failed to build ..." make -f Makefile.win $MAKEARGS CC="$C_COMPILER" CXX="$CXX_COMPILER" -j4 all || die "Failed to build ..."
make -f Makefile.win CC="$C_COMPILER" CXX="$CXX_COMPILER" dist_${BUILDTYPE} || die "Failed to dist ..." make -f Makefile.win $MAKEARGS CC="$C_COMPILER" CXX="$CXX_COMPILER" dist_${BUILDTYPE} || die "Failed to dist ..."
if [ "$BUILD_PHOENIX_GUI" = "yes" ]; then if [ "$BUILD_PHOENIX_GUI" = "yes" ]; then
zip "$ZIP_BASE" ssnes-phoenix.exe ssnes-phoenix.cfg zip "$ZIP_BASE" ssnes-phoenix.exe ssnes-phoenix.cfg
@ -131,7 +132,7 @@ if [ "$BUILD_32BIT" = yes ]; then
C_COMPILER=${MINGW32_BASE}-gcc C_COMPILER=${MINGW32_BASE}-gcc
CXX_COMPILER=${MINGW32_BASE}-g++ CXX_COMPILER=${MINGW32_BASE}-g++
WINDRES=${MINGW32_BASE}-windres WINDRES=${MINGW32_BASE}-windres
do_build "SSNES-w32" "SSNES-win32-libs.zip" "x86" do_build "SSNES-w32" "SSNES-win32-libs.zip" "x86" ""
fi fi
if [ "$BUILD_64BIT" = yes ]; then if [ "$BUILD_64BIT" = yes ]; then
@ -139,7 +140,7 @@ if [ "$BUILD_64BIT" = yes ]; then
C_COMPILER=${MINGW64_BASE}-gcc C_COMPILER=${MINGW64_BASE}-gcc
CXX_COMPILER=${MINGW64_BASE}-g++ CXX_COMPILER=${MINGW64_BASE}-g++
WINDRES=${MINGW64_BASE}-windres WINDRES=${MINGW64_BASE}-windres
do_build "SSNES-w64" "SSNES-win64-libs.zip" "x86_64" do_build "SSNES-w64" "SSNES-win64-libs.zip" "x86_64" "HAVE_SINC=1"
fi fi
message "Built successfully! :)" message "Built successfully! :)"