From 2dc7161453a9e416302d9bc6098aeb2641ed4901 Mon Sep 17 00:00:00 2001
From: Vlad Vissoultchev <wqweto@gmail.com>
Date: Sun, 13 Mar 2016 04:19:32 +0200
Subject: [PATCH] Win32 build script handles `x64` and `debug` params

---
 win32/build-tcc.bat | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/win32/build-tcc.bat b/win32/build-tcc.bat
index f5c414a..ec8d5ae 100644
--- a/win32/build-tcc.bat
+++ b/win32/build-tcc.bat
@@ -1,3 +1,4 @@
+@echo off
 @rem ----------------------------------------------------
 @rem batch file to build tcc using mingw gcc
 @rem ----------------------------------------------------
@@ -5,28 +6,30 @@
 @set /p VERSION= < ..\VERSION
 echo>..\config.h #define TCC_VERSION "%VERSION%"
 
-@rem @if _%PROCESSOR_ARCHITEW6432%_==_AMD64_ goto x86_64
-@if _%PROCESSOR_ARCHITECTURE%_==_AMD64_ goto x86_64
+@if _%1_==_AMD64_ shift /1 && goto x86_64
+@if _%1_==_x64_ shift /1 && goto x86_64
 
 @set target=-DTCC_TARGET_PE -DTCC_TARGET_I386
 @set CC=gcc -Os -s -fno-strict-aliasing
+@if _%1_==_debug_ set CC=gcc -g -ggdb
 @set P=32
 @goto tools
 
 :x86_64
 @set target=-DTCC_TARGET_PE -DTCC_TARGET_X86_64
-@rem mingw 64 has an ICE with -Os
-@set CC=x86_64-pc-mingw32-gcc -O0 -s -fno-strict-aliasing
+@set CC=x86_64-w64-mingw32-gcc -Os -s -fno-strict-aliasing
+@if _%1_==_debug_ set CC=x86_64-w64-mingw32-gcc -g -ggdb
 @set P=64
 @goto tools
 
 :tools
+echo will use %CC% %target%
 %CC% %target% tools/tiny_impdef.c -o tiny_impdef.exe
 %CC% %target% tools/tiny_libmaker.c -o tiny_libmaker.exe
 
 :libtcc
 if not exist libtcc mkdir libtcc
-copy ..\libtcc.h libtcc\libtcc.h
+copy ..\libtcc.h libtcc\libtcc.h > nul
 %CC% %target% -shared -DLIBTCC_AS_DLL -DONE_SOURCE ../libtcc.c -o libtcc.dll -Wl,-out-implib,libtcc/libtcc.a
 tiny_impdef libtcc.dll -o libtcc/libtcc.def
 
@@ -34,7 +37,7 @@ tiny_impdef libtcc.dll -o libtcc/libtcc.def
 %CC% %target% ../tcc.c -o tcc.exe -ltcc -Llibtcc
 
 :copy_std_includes
-copy ..\include\*.h include
+copy ..\include\*.h include > nul
 
 :libtcc1.a
 .\tcc %target% -c ../lib/libtcc1.c
@@ -60,8 +63,10 @@ tiny_libmaker lib/libtcc1.a libtcc1.o alloca86_64.o crt1.o wincrt1.o dllcrt1.o d
 del *.o
 
 :makedoc
+where makeinfo > nul 2>&1 || goto :skip_makedoc
 echo>..\config.texi @set VERSION %VERSION%
 if not exist doc md doc
 makeinfo --html --no-split -o doc\tcc-doc.html ../tcc-doc.texi
 copy tcc-win32.txt doc
 copy ..\tests\libtcc_test.c examples
+:skip_makedoc