Simplify the defintiion of optimization flags in Windows makefiles

The setting of -O1 for release mode builds can be factored out of the
x86 and x64 cases following commit 688ea162f4.

diff --git a/win32/Makefile b/win32/Makefile
index 7631eae..99986ca 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -428,7 +428,8 @@ LIBC        = msvcrt.lib
 OPTIMIZE       = -Od -MD -Zi -DDEBUGGING
 LINK_DBG       = -debug
 !ELSE
-OPTIMIZE       = -MD -Zi -DNDEBUG
+# -O1 yields smaller code, which turns out to be faster than -O2 on x86 and x64
+OPTIMIZE       = -O1 -MD -Zi -DNDEBUG
 # we enable debug symbols in release builds also
 LINK_DBG       = -debug -opt:ref,icf
 # you may want to enable this if you want COFF symbols in the executables
@@ -439,12 +440,8 @@ LINK_DBG   = -debug -opt:ref,icf
 #LINK_DBG      = $(LINK_DBG) -debugtype:both
 !  IF "$(WIN64)" == "define"
 # enable Whole Program Optimizations (WPO) and Link Time Code Generation (LTCG)
-OPTIMIZE       = $(OPTIMIZE) -O1 -GL
+OPTIMIZE       = $(OPTIMIZE) -GL
 LINK_DBG       = $(LINK_DBG) -ltcg
-!  ELSE
-# -O1 yields smaller code, which turns out to be faster than -O2 on x86
-OPTIMIZE       = $(OPTIMIZE) -O1
-#OPTIMIZE      = $(OPTIMIZE) -O2
 !  ENDIF
 !ENDIF
 

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 8a196a6..42dd49a 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -492,7 +492,8 @@ LIBC        = msvcrt.lib
 OPTIMIZE       = -Od -MD -Zi -DDEBUGGING
 LINK_DBG       = -debug
 .ELSE
-OPTIMIZE       = -MD -Zi -DNDEBUG
+# -O1 yields smaller code, which turns out to be faster than -O2 on x86 and x64
+OPTIMIZE       = -O1 -MD -Zi -DNDEBUG
 # we enable debug symbols in release builds also
 LINK_DBG       = -debug -opt:ref,icf
 # you may want to enable this if you want COFF symbols in the executables
@@ -503,12 +504,8 @@ LINK_DBG   = -debug -opt:ref,icf
 #LINK_DBG      = $(LINK_DBG) -debugtype:both
 .IF "$(WIN64)" == "define"
 # enable Whole Program Optimizations (WPO) and Link Time Code Generation (LTCG)
-OPTIMIZE       += -O1 -GL
+OPTIMIZE       += -GL
 LINK_DBG       += -ltcg
-.ELSE
-# -O1 yields smaller code, which turns out to be faster than -O2 on x86
-OPTIMIZE       += -O1
-#OPTIMIZE      += -O2
 .ENDIF
 .ENDIF