diff build.sh @ 53:554e3f02ba6f

Unify / update build system.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 03 Oct 2016 09:20:32 +0300
parents ea2d19de8932
children
line wrap: on
line diff
--- a/build.sh	Mon Oct 03 08:51:31 2016 +0300
+++ b/build.sh	Mon Oct 03 09:20:32 2016 +0300
@@ -2,24 +2,24 @@
 . ./build.cfg
 CPWD=`pwd`
 
-for build in amd:k8 intel:core2; do
+for build in intel:core2; do
 	# Split into platform and march
 	platform=`echo "$build"|cut -d ':' -f 1`
 	march=`echo "$build"|cut -d ':' -f 2`
 	
 	# Build Unix binary
 	make -f Makefile clean
-	make -f Makefile EXTRA_CFLAGS="-march=$march" EXEEXT=".bin" BINPATH="$CPWD/"
-	(strip "$CPWD/${CEXE}.bin" && mv "$CPWD/${CEXE}.bin" "$CPWD/${CBINPATH}${CEXE}-${platform}-linux32.bin") || exit 1
+	make -f Makefile EXTRA_CFLAGS="-O3 -march=$march" EXEEXT=".bin" BINPATH="$CPWD/"
+	(strip "$CPWD/${CEXE}.bin" && mv "$CPWD/${CEXE}.bin" "$CPWD/${CBINPATH}/${CEXE}-linux-x86.bin") || exit 1
 
 	# Build Win32 executable
 	make -f Makefile.w32 clean
-	make -f Makefile.w32 EXTRA_CFLAGS="-march=$march" EXEEXT=".exe" BINPATH="$CPWD/"
-	(mv "$CPWD/${CEXE}.exe" "$CPWD/${CBINPATH}${CEXE}_${platform}_win32.exe") || exit 1
+	make -f Makefile.w32 EXTRA_CFLAGS="-O3 -march=$march" EXEEXT=".exe" BINPATH="$CPWD/"
+	(mv "$CPWD/${CEXE}.exe" "$CPWD/${CBINPATH}/${CEXE}-win32.exe") || exit 1
 done
 
 (cd "$CPWD" && exec ./build-data.sh) || exit 1
 
 rm -f "$CPWD/$CZIP"
 
-cd "$CPWD/${CBINPATH}" && zip -9 "$CPWD/$CZIP" *
+cd "$CPWD/${CBINPATH}/" && zip -9 "$CPWD/$CZIP" *