diff --git a/makefile b/makefile
index a920eaa720a..8d10be9c777 100644
--- a/makefile
+++ b/makefile
@@ -745,7 +745,9 @@ MSBUILD_PARAMS += /p:Platform=x64
 else
 MSBUILD_PARAMS += /p:Platform=win32
 endif
-ifeq ($(SUBTARGET),mess)
+ifeq ($(SUBTARGET),mame)
+MSBUILD_SOLUTION := $(SUBTARGET).sln
+else ifeq ($(SUBTARGET),mess)
 MSBUILD_SOLUTION := $(SUBTARGET).sln
 else
 MSBUILD_SOLUTION := $(TARGET)$(SUBTARGET).sln
diff --git a/scripts/genie.lua b/scripts/genie.lua
index da376a11825..088636a7e5e 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -1134,6 +1134,7 @@ configuration { "vs*" }
 		}
 
 		buildoptions {
+			"/WX",	   -- Treats all compiler warnings as errors.
 			"/wd4025", -- warning C4025: 'number' : based pointer passed to function with variable arguments: parameter number
 			"/wd4003", -- warning C4003: not enough actual parameters for macro 'xxx'
 			"/wd4018", -- warning C4018: 'x' : signed/unsigned mismatch