winbuild: Additional clean up

3 files changed, 3 insertions, 7 deletions

diff --git a/winbuild/BUILD.WINDOWS.txt b/winbuild/BUILD.WINDOWS.txt
index 2485078c5..5eac3820d 100644
--- 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

   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)

   DEBUG=<yes or no>            - Debug builds

-  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 53d3e7ff9..d81c6ffa9 100644
--- 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

 !MESSAGE   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)

 !MESSAGE   DEBUG=<yes or no>            - Debug builds

-!MESSAGE   MACHINE=<X86 or X64>         - Target architecture (default x86)
+!MESSAGE   MACHINE=<x86 or x64>         - Target architecture (default x86)
 !ERROR please choose a valid mode

 

 !ENDIF

@@ -56,7 +56,7 @@ ENABLE_SSPI = $(USE_SSPI)
 

 # default options

 !IFNDEF MACHINE
-MACHINE = X86
+MACHINE = x86
 !ENDIF
 
 !IFNDEF ENABLE_IDN

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index e573e9145..016ba67a9 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -319,10 +319,6 @@ CFLAGS = $(CFLAGS) $(SSPI_CFLAGS)
 CFLAGS = $(CFLAGS) $(SPNEGO_CFLAGS)

 !ENDIF

 

-!IF "$(USE_WINSSL)"=="true"

-#
-!ENDIF

-

 !IF "$(GEN_PDB)"=="true"

 CFLAGS = $(CFLAGS) $(CFLAGS_PDB)

 LFLAGS = $(LFLAGS) $(LFLAGS_PDB)