# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1348889770 -10800
# Node ID db2e214a30eb0fa0b2c6fc1e8a6a56da906c78e1
# Parent  ca2daec0820434671d107d61ace35cabd7c6eba1
Improve build process.

diff -r ca2daec08204 -r db2e214a30eb Makefile.w32
--- a/Makefile.w32	Sat Sep 29 06:02:53 2012 +0300
+++ b/Makefile.w32	Sat Sep 29 06:36:10 2012 +0300
@@ -5,9 +5,9 @@
 MINGW_PATH=/usr/i686-w64-mingw32
 
 DMLIB = ./dmlib/
-BINPATH=./exe/
-OBJPATH=./win32/
-EXEEXT=.exe
+BINPATH ?= .
+OBJPATH ?= ./win32/
+EXEEXT ?= .exe
 
 # C-compiler, flags and linker flags
 CC=$(MINGW_PREFIX)gcc
diff -r ca2daec08204 -r db2e214a30eb build.sh
--- a/build.sh	Sat Sep 29 06:02:53 2012 +0300
+++ b/build.sh	Sat Sep 29 06:36:10 2012 +0300
@@ -3,13 +3,16 @@
 CEXE=krapula
 CBINPATH=exe/
 
-for arch in i686 core2; do
+for build in amd:k8 intel:core2; do
+	arch=`echo "$build"|cut -d ':' -f 1`
+	march=`echo "$build"|cut -d ':' -f 2`
+	
 	make -f Makefile clean
-	make -f Makefile EXTRA_CFLAGS="-march=$arch" EXEEXT=".bin"
-	mv "$CPWD/${CBINPATH}${CEXE}.bin" "$CPWD/${CBINPATH}${CEXE}-${arch}.bin"
-	strip "$CPWD/${CBINPATH}${CEXE}-${arch}.bin"
+	make -f Makefile EXTRA_CFLAGS="-march=$march" EXEEXT=".bin" BINPATH="$CPWD/${CBINPATH}"
+	strip "$CPWD/${CBINPATH}${CEXE}.bin" && \
+	mv "$CPWD/${CBINPATH}${CEXE}.bin" "$CPWD/${CBINPATH}${CEXE}-${arch}-linux32.bin"
 
 	make -f Makefile.w32 clean
-	make -f Makefile.w32 EXTRA_CFLAGS="-march=$arch"
+	make -f Makefile.w32 EXTRA_CFLAGS="-march=$march" EXEEXT=".exe" BINPATH="$CPWD/${CBINPATH}"
 	mv "$CPWD/${CBINPATH}${CEXE}.exe" "$CPWD/${CBINPATH}${CEXE}_${arch}.exe"
 done