>From 719d2337933e6e1d699c414a56689e34a00d078a Mon Sep 17 00:00:00 2001
From: Jannick <address@hidden>
Date: Tue, 5 Nov 2019 16:00:54 +0100
Subject: [PATCH 01/13] Windows build: regroup code blocks in build_w32.bat

Minor commit without essentially changing the script logic.

* build_w32.bat:
  - move default value definition block before --help check block.
  - unquote the command line argument.
---
 build_w32.bat | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/build_w32.bat b/build_w32.bat
index b245d05..f1a55a4 100755
--- a/build_w32.bat
+++ b/build_w32.bat
@@ -24,13 +24,7 @@ if not "%RECURSEME%"=="%~0" (
 
 call :Reset
 
-if "%1" == "-h" goto Usage
-if "%1" == "--help" goto Usage
-
-echo.
-echo Creating GNU Make for Windows 9X/NT/2K/XP/Vista/7/8/10
-echo.
-
+:: set defaults
 set MAKE=gnumake
 set GUILE=Y
 set COMPILER=cl.exe
@@ -38,6 +32,13 @@ set O=obj
 set ARCH=x64
 set DEBUG=N
 
+if "%~1" == "-h" goto Usage
+if "%~1" == "--help" goto Usage
+
+echo.
+echo Creating GNU Make for Windows 9X/NT/2K/XP/Vista/7/8/10
+echo.
+
 if exist maintMakefile (
     set MAINT=Y
 ) else (
@@ -45,11 +46,11 @@ if exist maintMakefile (
 )
 
 :ParseSW
-if "%1" == "--debug" goto SetDebug
-if "%1" == "--without-guile" goto NoGuile
-if "%1" == "--x86" goto Set32Bit
-if "%1" == "gcc" goto SetCC
-if "%1" == "" goto DoneSW
+if "%~1" == "--debug" goto SetDebug
+if "%~1" == "--without-guile" goto NoGuile
+if "%~1" == "--x86" goto Set32Bit
+if "%~1" == "gcc" goto SetCC
+if "%~1" == "" goto DoneSW
 goto Usage
 
 :SetDebug
-- 
2.24.0.windows.1