From eb1de7d3260d08248a0c04770117c1569f7779d2 Mon Sep 17 00:00:00 2001
From: waltje <decwiz@yahoo.com>
Date: Thu, 20 Sep 2018 00:30:28 -0400
Subject: [PATCH] Update for Makefile under VC to actually enable optimization.
 PR from 360CodeSafe to catch file-open errors in CPU module.

---
 src/win/mingw/Makefile.MinGW |  6 +++---
 src/win/msvc/Makefile.VC     | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/win/mingw/Makefile.MinGW b/src/win/mingw/Makefile.MinGW
index 684295f..0d0a89d 100644
--- a/src/win/mingw/Makefile.MinGW
+++ b/src/win/mingw/Makefile.MinGW
@@ -8,7 +8,7 @@
 #
 #		Makefile for Windows systems using the MinGW32 environment.
 #
-# Version:	@(#)Makefile.mingw	1.0.59	2018/09/03
+# Version:	@(#)Makefile.mingw	1.0.60	2018/09/19
 #
 # Author:	Fred N. van Kempen, <decwiz@yahoo.com>
 #
@@ -356,8 +356,8 @@ endif
 LIBS		:= -mwindows \
 		   -lddraw -ldinput8 -ldxguid -ld3d9 -ld3dx9 \
 		   -lversion -lcomctl32 -lwinmm
-LIBS		+= -lkernel32 -lwsock32 -liphlpapi -lpsapi
-LIBS		+= -lpthread -static -lstdc++ -lgcc
+LIBS		+= -lwsock32 -liphlpapi -lpsapi #-lpthread
+LIBS		+= -static -lstdc++ -lgcc
 ifneq ($(X64), y)
  LIBS		+= -Wl,--large-address-aware
 endif
diff --git a/src/win/msvc/Makefile.VC b/src/win/msvc/Makefile.VC
index 343ba3c..301a9ea 100644
--- a/src/win/msvc/Makefile.VC
+++ b/src/win/msvc/Makefile.VC
@@ -8,7 +8,7 @@
 #
 #		Makefile for Windows using Visual Studio 2015.
 #
-# Version:	@(#)Makefile.VC	1.0.45	2018/09/03
+# Version:	@(#)Makefile.VC	1.0.46	2018/09/19
 #
 # Author:	Fred N. van Kempen, <decwiz@yahoo.com>
 #
@@ -292,14 +292,14 @@ endif
 ifeq ($(DEBUG), y)
  OPTS		+= -D_DEBUG
  DOPTS		+= -MTd -Gs -Zi
- ROPTS		+= -D_DEBUG
+ RFLAGS		+= -D_DEBUG
  LOPTS		+= -debug
- AOPTIM		:=
  ifndef COPTIM
   COPTIM	:= -Od
  endif
 else
- DOPTS		:= -MT -Gs
+ LOPTS		+= -LTCG
+ DOPTS		:= -MT -GL
  ifndef COPTIM
   COPTIM	:= -O2
  endif
@@ -330,7 +330,7 @@ endif
 LIBS		:= ddraw.lib dinput8.lib dxguid.lib d3d9.lib d3dx9.lib \
 		   version.lib comctl32.lib winmm.lib comdlg32.lib \
 		   advapi32.lib gdi32.lib shell32.lib user32.lib \
-		   kernel32.lib wsock32.lib iphlpapi.lib psapi.lib
+		   wsock32.lib iphlpapi.lib psapi.lib
 ifeq ($(DEBUG), y)
 LIBS		+= libcmtd.lib libvcruntimed.lib  libucrtd.lib
 endif
@@ -531,8 +531,8 @@ endif
 
 # Final versions of the toolchain flags.
 LDFLAGS		:= $(LOPTS)
-CFLAGS		:= $(WX_FLAGS) $(OPTS) $(COPTS) $(DOPTS) $(AOPTIM) $(AFLAGS)
-CXXFLAGS	:= $(WX_FLAGS) $(OPTS) $(CXXOPTS) $(COPTS) $(DOPTS) $(AOPTIM) $(AFLAGS)
+CFLAGS		:= $(WX_FLAGS) $(OPTS) $(COPTS) $(COPTIM) $(DOPTS) $(AFLAGS)
+CXXFLAGS	:= $(WX_FLAGS) $(OPTS) $(CXXOPTS) $(COPTS) $(COPTIM) $(DOPTS) $(AFLAGS)
 
 
 #########################################################################