Mercurial > hg > demos > krapula
changeset 13:fcca32ea1ca8
Improve build process.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sat, 29 Sep 2012 07:20:08 +0300 |
| parents | 4bfeef9f361a |
| children | b2b506e1f42a |
| files | Makefile.w32 build.sh |
| diffstat | 2 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.w32 Sat Sep 29 06:46:15 2012 +0300 +++ b/Makefile.w32 Sat Sep 29 07:20:08 2012 +0300 @@ -5,7 +5,7 @@ MINGW_PATH=/usr/i686-w64-mingw32 DMLIB = ./dmlib/ -BINPATH ?= . +BINPATH ?= ./ OBJPATH ?= ./win32/ EXEEXT ?= .exe
--- a/build.sh Sat Sep 29 06:46:15 2012 +0300 +++ b/build.sh Sat Sep 29 07:20:08 2012 +0300 @@ -2,17 +2,26 @@ CPWD=`pwd` CEXE=krapula CBINPATH=exe/ +CZIP=ap-krapula.zip for build in amd:k8 intel:core2; do - arch=`echo "$build"|cut -d ':' -f 1` + # 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/${CBINPATH}" - strip "$CPWD/${CBINPATH}${CEXE}.bin" && \ - mv "$CPWD/${CBINPATH}${CEXE}.bin" "$CPWD/${CBINPATH}${CEXE}-${arch}-linux32.bin" + 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 + # Build Win32 executable make -f Makefile.w32 clean - make -f Makefile.w32 EXTRA_CFLAGS="-march=$march" EXEEXT=".exe" BINPATH="$CPWD/${CBINPATH}" - mv "$CPWD/${CBINPATH}${CEXE}.exe" "$CPWD/${CBINPATH}${CEXE}_${arch}.exe" + make -f Makefile.w32 EXTRA_CFLAGS="-march=$march" EXEEXT=".exe" BINPATH="$CPWD/" + (mv "$CPWD/${CEXE}.exe" "$CPWD/${CBINPATH}${CEXE}_${platform}_win32.exe") || exit 1 done + +(cd "$CPWD" && exec ./build-data.sh) || exit 1 + +rm -f "$CPWD/$CZIP" + +cd "$CPWD/${CBINPATH}" && zip -9 "$CPWD/$CZIP" *