winbuild: Additional clean up

diff --git a/winbuild/BUILD.WINDOWS.txt b/winbuild/BUILD.WINDOWS.txt
index 2485078c584254eafe456e0b75ea73dda6007470..5eac3820d001f2b5c92ca43b0830a2c612b5d8e9 100644 (file)
--- a/winbuild/BUILD.WINDOWS.txt
+++ b/winbuild/BUILD.WINDOWS.txt
@@ -68,4 +68,4 @@ where <options> is one or many of:
   ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, defaults to yes\r
   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)\r
   DEBUG=<yes or no>            - Debug builds\r
-  MACHINE=<X86 or X64>         - Target architecture (default is X86)
\ No newline at end of file
+  MACHINE=<x86 or x64>         - Target architecture (default is x86)
\ No newline at end of file

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 53d3e7ff984f7d68748424c233c48cfdf0aa1ffd..d81c6ffa98ea46570ccdd75645291da13a6c1057 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -32,7 +32,7 @@ CFGSET=true
 !MESSAGE   ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, defaults to yes\r
 !MESSAGE   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)\r
 !MESSAGE   DEBUG=<yes or no>            - Debug builds\r
-!MESSAGE   MACHINE=<X86 or X64>         - Target architecture (default x86)
+!MESSAGE   MACHINE=<x86 or x64>         - Target architecture (default x86)
 !ERROR please choose a valid mode\r
 \r
 !ENDIF\r
@@ -56,7 +56,7 @@ ENABLE_SSPI = $(USE_SSPI)
 \r
 # default options\r
 !IFNDEF MACHINE
-MACHINE = X86
+MACHINE = x86
 !ENDIF
 
 !IFNDEF ENABLE_IDN\r

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index e573e9145c33ca9ede8912970b99cb0bd9def12f..016ba67a98f55a490c44cae175ce144524f62d85 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -319,10 +319,6 @@ CFLAGS = $(CFLAGS) $(SSPI_CFLAGS)
 CFLAGS = $(CFLAGS) $(SPNEGO_CFLAGS)\r
 !ENDIF\r
 \r
-!IF "$(USE_WINSSL)"=="true"\r
-#
-!ENDIF\r
-\r
 !IF "$(GEN_PDB)"=="true"\r
 CFLAGS = $(CFLAGS) $(CFLAGS_PDB)\r
 LFLAGS = $(LFLAGS) $(LFLAGS_PDB)\r