wip

Author: acmorrow

SConstruct

@@ -1320,7 +1320,7 @@ elif env.TargetOSIs('windows'):
 
     # /EHsc exception handling style for visual studio
     # /W3 warning level
-    env.Append(CCFLAGS=["/EHsc","/W3"])
+    # env.Append(CCFLAGS=["/EHsc","/W3"])
 
     # some warnings we don't like:
     # c4355
@@ -1345,8 +1345,8 @@ elif env.TargetOSIs('windows'):
     #  on extremely old versions of MSVC (pre 2k5), default constructing an array member in a
     #  constructor's initialization list would not zero the array members "in some cases".
     #  since we don't target MSVC versions that old, this warning is safe to ignore.
-    env.Append( CCFLAGS=["/wd4355", "/wd4800", "/wd4267", "/wd4244",
-                         "/wd4290", "/wd4068", "/wd4351"] )
+    # env.Append( CCFLAGS=["/wd4355", "/wd4800", "/wd4267", "/wd4244",
+    #                      "/wd4290", "/wd4068", "/wd4351"] )
 
     # some warnings we should treat as errors:
     # c4013
@@ -1363,7 +1363,7 @@ elif env.TargetOSIs('windows'):
     #     was probably intended as a variable definition.  A common example is accidentally
     #     declaring a function called lock that takes a mutex when one meant to create a guard
     #     object called lock on the stack.
-    env.Append( CCFLAGS=["/we4013", "/we4099", "/we4930"] )
+    # env.Append( CCFLAGS=["/we4013", "/we4099", "/we4930"] )
 
     env.Append( CPPDEFINES=["_CONSOLE","_CRT_SECURE_NO_WARNINGS"] )
 
@@ -1373,15 +1373,15 @@ elif env.TargetOSIs('windows'):
     # docs say don't use /FD from command line (minimal rebuild)
     # /Gy function level linking (implicit when using /Z7)
     # /Z7 debug info goes into each individual .obj file -- no .pdb created 
-    env.Append( CCFLAGS= ["/Z7", "/errorReport:none"] )
+    # env.Append( CCFLAGS= ["/Z7", "/errorReport:none"] )
 
     # /DEBUG will tell the linker to create a .pdb file
     # which WinDbg and Visual Studio will use to resolve
     # symbols if you want to debug a release-mode image.
     # Note that this means we can't do parallel links in the build.
     #
     # Please also note that this has nothing to do with _DEBUG or optimization.
-    env.Append( LINKFLAGS=["/DEBUG"] )
+    # env.Append( LINKFLAGS=["/DEBUG"] )
 
     # /MD:  use the multithreaded, DLL version of the run-time library (MSVCRT.lib/MSVCR###.DLL)
     # /MT:  use the multithreaded, static version of the run-time library (LIBCMT.lib)
@@ -1397,42 +1397,42 @@ elif env.TargetOSIs('windows'):
         ( True,  True  ) : "/MDd",
     }
 
-    env.Append(CCFLAGS=[winRuntimeLibMap[(dynamicCRT, debugBuild)]])
+    #env.Append(CCFLAGS=[winRuntimeLibMap[(dynamicCRT, debugBuild)]])
 
-    if optBuild:
+    #if optBuild:
         # /O2:  optimize for speed (as opposed to size)
         # /Oy-: disable frame pointer optimization (overrides /O2, only affects 32-bit)
         # /INCREMENTAL: NO - disable incremental link - avoid the level of indirection for function
         # calls
-        env.Append( CCFLAGS=["/O2", "/Oy-"] )
-        env.Append( LINKFLAGS=["/INCREMENTAL:NO"])
-    else:
-        env.Append( CCFLAGS=["/Od"] )
+        #env.Append( CCFLAGS=["/O2", "/Oy-"] )
+        #env.Append( LINKFLAGS=["/INCREMENTAL:NO"])
+    #else:
+        #env.Append( CCFLAGS=["/Od"] )
 
-    if debugBuild and not optBuild:
+    #if debugBuild and not optBuild:
         # /RTC1: - Enable Stack Frame Run-Time Error Checking; Reports when a variable is used
         # without having been initialized (implies /Od: no optimizations)
-        env.Append( CCFLAGS=["/RTC1"] )
+        # env.Append( CCFLAGS=["/RTC1"] )
 
     # Support large object files since some unit-test sources contain a lot of code
-    env.Append( CCFLAGS=["/bigobj"] )
+    # env.Append( CCFLAGS=["/bigobj"] )
 
     # This gives 32-bit programs 4 GB of user address space in WOW64, ignored in 64-bit builds
-    env.Append( LINKFLAGS=["/LARGEADDRESSAWARE"] )
+    # env.Append( LINKFLAGS=["/LARGEADDRESSAWARE"] )
 
     env.Append(
         LIBS=[
-            'DbgHelp.lib',
-            'Iphlpapi.lib',
-            'Psapi.lib',
-            'advapi32.lib',
-            'bcrypt.lib',
-            'crypt32.lib',
-            'kernel32.lib',
-            'shell32.lib',
-            'version.lib',
-            'winmm.lib',
-            'ws2_32.lib',
+            'dbghelp',
+            'iphlpapi',
+            'psapi',
+            'advapi32',
+            'bcrypt',
+            'crypt32',
+            'kernel32',
+            'shell32',
+            'version',
+            'winmm',
+            'ws2_32',
         ],
     )
 
@@ -2003,7 +2003,7 @@ def doConfigure(myenv):
 
             test_body = """
             #include <windows.h>
-            #if !defined(NTDDI_WINBLUE)
+            #if !defined(NTDDI_WIN8)
             #error Need Windows SDK Version 8.1 or higher
             #endif
             """

src/mongo/platform/windows_basic.h

@@ -110,7 +110,7 @@
 #error "Expected WINVER to have been defined and to equal _WIN32_WINNT"
 #endif
 
-#if !defined(NTDDI_WINBLUE)
+#if !defined(NTDDI_WIN8)
 #error "MongoDB requires Windows SDK 8.1 or higher to build"
 #endif