diff --git a/.gitignore b/.gitignore
index 460495b..2db4063 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,9 +23,6 @@
 *.vcxproj
 *.sdf
 *.filters
-build
-build32
-dbuild
 external
 build-android/external
 *.config
diff --git a/000_update_externals.bat b/000_update_externals.bat
new file mode 100644
index 0000000..166e861
--- /dev/null
+++ b/000_update_externals.bat
@@ -0,0 +1,13 @@
+set OLDDIR=%CD%
+@cd "C:\Program Files (x86)\Microsoft Visual Studio 14.0"
+call "Common7\Tools\VsDevCmd.bat"
+@set PATH=C:\Program Files\CMake\bin;%PATH%
+@date /t
+@time /t
+cd %OLDDIR%
+
+call ".\update_external_sources.bat" --all
+@date /t
+@time /t
+REM look at build_windows_targets.bat
+@pause
diff --git a/001_visual_studio.bat b/001_visual_studio.bat
new file mode 100644
index 0000000..7cfbf14
--- /dev/null
+++ b/001_visual_studio.bat
@@ -0,0 +1,13 @@
+set OLDDIR=%CD%
+@cd "C:\Program Files (x86)\Microsoft Visual Studio 14.0"
+call "Common7\Tools\VsDevCmd.bat"
+@set PATH=C:\Program Files\CMake\bin;%PATH%
+@date /t
+@time /t
+cd %OLDDIR%
+
+set TGT_DIR=BUILD
+cmake -G "Visual Studio 14 Win64" -H. -B%TGT_DIR%
+cd %TGT_DIR%
+set VK_LAYER_PATH=%CD%\layers\Debug
+start VULKAN.sln
diff --git a/002_copy_gtest.txt b/002_copy_gtest.txt
new file mode 100644
index 0000000..7104a6e
--- /dev/null
+++ b/002_copy_gtest.txt
@@ -0,0 +1,5 @@
+
+On Windows, must copy LVL gtest binaries to be found by test executables.
+
+copy   BUILD\tests\gtest-1.7.0\Debug\*.dll   BUILD\tests\Debug
+
diff --git a/005_build_windows_targets.bat b/005_build_windows_targets.bat
new file mode 100644
index 0000000..ebb647b
--- /dev/null
+++ b/005_build_windows_targets.bat
@@ -0,0 +1,12 @@
+set OLDDIR=%CD%
+@cd "C:\Program Files (x86)\Microsoft Visual Studio 14.0"
+call "Common7\Tools\VsDevCmd.bat"
+@set PATH=C:\Program Files\CMake\bin;%PATH%
+@date /t
+@time /t
+cd %OLDDIR%
+
+call .\build_windows_targets.bat
+@date /t
+@time /t
+@pause
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..f48c0d9
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,60 @@
+# Linux makefile for
+# https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers
+# mikew@lunarg.com
+
+RELEASE_DIR  = build
+DEBUG_DIR    = dbuild
+EXTERNAL_DIR = external
+
+TARGET_NAME = vk_layer_validation_tests
+RELEASE_TARGET = $(RELEASE_DIR)/tests/$(TARGET_NAME)
+DEBUG_TARGET = $(DEBUG_DIR)/tests/$(TARGET_NAME)
+
+.DELETE_ON_ERROR: $(RELEASE_TARGET) $(DEBUG_TARGET)
+
+
+.PHONY: all
+all: $(RELEASE_TARGET) $(DEBUG_TARGET)
+
+$(EXTERNAL_DIR):
+	./update_external_sources.sh
+
+$(RELEASE_DIR): $(EXTERNAL_DIR)
+	cmake -H. -B$@ -DCMAKE_BUILD_TYPE=Release
+
+$(DEBUG_DIR): $(EXTERNAL_DIR)
+	cmake -H. -B$@ -DCMAKE_BUILD_TYPE=Debug
+
+$(RELEASE_TARGET): $(RELEASE_DIR)
+	$(MAKE) -C $(RELEASE_DIR)
+
+$(DEBUG_TARGET): $(DEBUG_DIR)
+	$(MAKE) -C $(DEBUG_DIR)
+
+
+.PHONY: test_release
+test_release: $(RELEASE_TARGET)
+	cd $(RELEASE_DIR)/tests && VK_LAYER_PATH=$(PWD)/$(RELEASE_DIR)/layers ./$(TARGET_NAME)
+
+.PHONY: test_debug
+test_debug: $(DEBUG_TARGET)
+	cd $(DEBUG_DIR)/tests && VK_LAYER_PATH=$(PWD)/$(DEBUG_DIR)/layers ./$(TARGET_NAME)
+
+.PHONY: t test
+t test: test_release test_debug
+
+.PHONY: clean
+clean:
+	-rm -f $(RELEASE_TARGET)
+	-rm -f $(DEBUG_TARGET)
+
+.PHONY: clobber
+clobber: clean
+	-rm -rf $(RELEASE_DIR)
+	-rm -rf $(DEBUG_DIR)
+
+.PHONY: nuke
+nuke: clobber
+	-rm -rf $(EXTERNAL_DIR)
+
+# vim: set sw=4 ts=8 noet ic ai: