1 files changed, 30 insertions, 14 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index 05806d2fe8..150d418502 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -166,20 +166,22 @@ def configure_msvc(env, manual_msvc_config):
     # Build type
 
     if (env["target"] == "release"):
-        env.Append(CCFLAGS=['/O2'])
+        if (env["optimize"] == "speed"): #optimize for speed (default)
+            env.Append(CCFLAGS=['/O2'])
+        else: # optimize for size
+            env.Append(CCFLAGS=['/O1'])
         env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])
         env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup'])
+        env.Append(LINKFLAGS=['/OPT:REF'])
 
     elif (env["target"] == "release_debug"):
-        env.Append(CCFLAGS=['/O2'])
+        if (env["optimize"] == "speed"): #optimize for speed (default)
+            env.Append(CCFLAGS=['/O2'])
+        else: # optimize for size
+            env.Append(CCFLAGS=['/O1'])
         env.AppendUnique(CPPDEFINES = ['DEBUG_ENABLED'])
         env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
-
-    elif (env["target"] == "debug_release"):
-        env.Append(CCFLAGS=['/Z7', '/Od'])
-        env.Append(LINKFLAGS=['/DEBUG'])
-        env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])
-        env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup'])
+        env.Append(LINKFLAGS=['/OPT:REF'])
 
     elif (env["target"] == "debug"):
         env.AppendUnique(CCFLAGS=['/Z7', '/Od', '/EHsc'])
@@ -188,6 +190,10 @@ def configure_msvc(env, manual_msvc_config):
         env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
         env.Append(LINKFLAGS=['/DEBUG'])
 
+    if (env["debug_symbols"] == "full" or env["debug_symbols"] == "yes"):
+        env.AppendUnique(CCFLAGS=['/Z7'])
+        env.AppendUnique(LINKFLAGS=['/DEBUG'])
+
     ## Compile/link flags
 
     env.AppendUnique(CCFLAGS=['/MT', '/Gd', '/GR', '/nologo'])
@@ -200,9 +206,11 @@ def configure_msvc(env, manual_msvc_config):
 
     env.AppendUnique(CPPDEFINES = ['WINDOWS_ENABLED', 'OPENGL_ENABLED',
                                    'RTAUDIO_ENABLED', 'WASAPI_ENABLED',
-                                   'TYPED_METHOD_BIND', 'WIN32', 'MSVC',
+                                   'WINMIDI_ENABLED', 'TYPED_METHOD_BIND',
+                                   'WIN32', 'MSVC',
                                    {'WINVER' : '$target_win_version',
                                     '_WIN32_WINNT': '$target_win_version'}])
+    env.AppendUnique(CPPDEFINES=['NOMINMAX']) # disable bogus min/max WinDef.h macros
     if env["bits"] == "64":
         env.AppendUnique(CPPDEFINES=['_WIN64'])
 
@@ -247,10 +255,14 @@ def configure_mingw(env):
     if (env["target"] == "release"):
         env.Append(CCFLAGS=['-msse2'])
 
-        if (env["bits"] == "64"):
-            env.Append(CCFLAGS=['-O3'])
-        else:
-            env.Append(CCFLAGS=['-O2'])
+        if (env["optimize"] == "speed"): #optimize for speed (default)
+            if (env["bits"] == "64"):
+                env.Append(CCFLAGS=['-O3'])
+            else:
+                env.Append(CCFLAGS=['-O2'])
+        else: #optimize for size
+            env.Prepend(CCFLAGS=['-Os'])
+   
 
         env.Append(LINKFLAGS=['-Wl,--subsystem,windows'])
 
@@ -265,7 +277,11 @@ def configure_mingw(env):
            env.Prepend(CCFLAGS=['-g1'])
         if (env["debug_symbols"] == "full"):
            env.Prepend(CCFLAGS=['-g2'])
-
+        if (env["optimize"] == "speed"): #optimize for speed (default)
+           env.Append(CCFLAGS=['-O2'])
+        else: #optimize for size
+           env.Prepend(CCFLAGS=['-Os'])
+   
     elif (env["target"] == "debug"):
         env.Append(CCFLAGS=['-g3', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])