From 4efe74c2d14a427db4623d47b2d9b88e11bf5d4d Mon Sep 17 00:00:00 2001
From: Tino Reichardt <milky-7zip@mcmilk.de>
Date: Thu, 16 Apr 2020 23:59:06 +0200
Subject: [PATCH] More Build.mak optimizations and fix for LzmaDec.mak

---
 CPP/7zip/LzmaDec.mak | 2 +-
 CPP/Build.mak        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CPP/7zip/LzmaDec.mak b/CPP/7zip/LzmaDec.mak
index 9aa30863..08dac72d 100644
--- a/CPP/7zip/LzmaDec.mak
+++ b/CPP/7zip/LzmaDec.mak
@@ -1,5 +1,5 @@
 !IF "$(PLATFORM)" == "x64"
-CFLAGS_C_SPEC = -D_LZMA_DEC_OPT
+CFLAGS = $(CFLAGS) -D_LZMA_DEC_OPT
 ASM_OBJS = $(ASM_OBJS) \
   $O\LzmaDecOpt.obj
 !ENDIF
diff --git a/CPP/Build.mak b/CPP/Build.mak
index 07c87eee..0025656a 100644
--- a/CPP/Build.mak
+++ b/CPP/Build.mak
@@ -13,7 +13,7 @@ O=o
 
 LIBS = $(LIBS) oleaut32.lib ole32.lib user32.lib advapi32.lib shell32.lib
 
-CFLAGS = $(CFLAGS) -c /nologo /Fo$O/ /W4 /WX /EHsc /MT /MP /GL /Gw
+CFLAGS = $(CFLAGS) -c /nologo /Fo$O/ /W4 /WX /EHsc /MT /MP /GR- /GL /Gw /Gy
 
 !IFDEF MY_CONSOLE
 CFLAGS = $(CFLAGS) -D_CONSOLE
@@ -22,7 +22,7 @@ CFLAGS = $(CFLAGS) -D_CONSOLE
 CFLAGS_O1 = $(CFLAGS) /O1
 CFLAGS_O2 = $(CFLAGS) /O2 /Ob3
 
-LFLAGS = $(LFLAGS) /nologo /LTCG /LARGEADDRESSAWARE /OPT:REF,ICF,LBR
+LFLAGS = $(LFLAGS) /nologo /LTCG /LARGEADDRESSAWARE
 
 !IFDEF DEF_FILE
 LFLAGS = $(LFLAGS) /DLL /DEF:$(DEF_FILE)