From 46fea439c0a62bdf101d30b7a629d16aa9c492ce Mon Sep 17 00:00:00 2001
From: Jeffrey Clark <h0tw1r3@users.noreply.github.com>
Date: Mon, 13 Jun 2016 18:03:37 -0700
Subject: [PATCH 1/2] fix build (nw)

---
 src/mame/machine/atarixga.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mame/machine/atarixga.cpp b/src/mame/machine/atarixga.cpp
index ac423c9c641..f2a03af5073 100644
--- a/src/mame/machine/atarixga.cpp
+++ b/src/mame/machine/atarixga.cpp
@@ -18,6 +18,7 @@
  
 *************************************************************************/
 
+#include "emu.h"
 #include "atarixga.h"
 
 

From c35dee137131b7df1a97aa025f998e907582b202 Mon Sep 17 00:00:00 2001
From: Jeffrey Clark <h0tw1r3@users.noreply.github.com>
Date: Mon, 13 Jun 2016 11:02:06 -0700
Subject: [PATCH 2/2] cmake generate, posix on windows (nw)

---
 makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makefile b/makefile
index dff412e0dd2..ecb7995e7fa 100644
--- a/makefile
+++ b/makefile
@@ -1414,7 +1414,7 @@ endif
 .PHONY: cmake
 cmake: generate
 	$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) cmake
-ifeq ($(OS),windows)
+ifneq (posix,$(SHELLTYPE))
 	$(SILENT)echo cmake_minimum_required(VERSION 2.8.4) > CMakeLists.txt
 	$(SILENT)echo add_subdirectory($(PROJECTDIR)/cmake) >> CMakeLists.txt
 else