From 49cce9e4d87ce862fe71f85c86b7b0d2bb0ed571 Mon Sep 17 00:00:00 2001
From: Vinyl Darkscratch <vinyldarkscratch@gmail.com>
Date: Thu, 4 Oct 2018 13:02:09 -0700
Subject: [PATCH 1/3] Ignore temporary files

---
 .gitignore | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc5d49b..743dd3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,16 @@
 *.bmp
 *.lproj
 
+*.tmp
+*.vcxproj
+*.filters
+*.sln
+
+bin/
+lib/
+oneshot\.dir/
+x64/
+
 Makefile*
 
 /oneshot
@@ -34,11 +44,10 @@ OneShot
 .qmake.stash
 CMakeCache.txt
 CMakeFiles/
+cmake_install\.cmake
 conanbuildinfo\.cmake
 conaninfo\.txt
 conanbuildinfo\.txt
-cmake_install\.cmake
+conan_imports_manifest\.txt
 
 oclint/
-
-*.tmp

From f754921b44e6e2c639dfb95f5b20c36b373c3b4d Mon Sep 17 00:00:00 2001
From: Vinyl Darkscratch <vinyldarkscratch@gmail.com>
Date: Thu, 4 Oct 2018 13:02:23 -0700
Subject: [PATCH 2/3] Fix Windows compilation errors

---
 CMakeLists.txt               | 3 +++
 binding-mri/niko-binding.cpp | 1 +
 2 files changed, 4 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e17b062..1ba4eab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,6 +151,9 @@ if(WIN32)
 	list(APPEND MAIN_SOURCE assets/resources.rc)
 	list(APPEND DEFINES UNICODE)
 	list(APPEND PLATFORM_LIBRARIES Secur32)
+	include_directories(
+		${CMAKE_CURRENT_BINARY_DIR}/windows
+	)
 endif()
 
 if (STEAM)
diff --git a/binding-mri/niko-binding.cpp b/binding-mri/niko-binding.cpp
index 5b7a47c..8038e93 100644
--- a/binding-mri/niko-binding.cpp
+++ b/binding-mri/niko-binding.cpp
@@ -5,6 +5,7 @@
 #include "debugwriter.h"
 
 #if defined _WIN32
+#define OS_W32
 #include <shlwapi.h>
 #elif defined __APPLE__ || __linux__
 	#define LINUX

From 69a86ca58a5d5628e2f52eacf8ab45f8a58000a6 Mon Sep 17 00:00:00 2001
From: Vinyl Darkscratch <vinyldarkscratch@gmail.com>
Date: Thu, 4 Oct 2018 13:21:08 -0700
Subject: [PATCH 3/3] Ignore junk files

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 743dd3b..dd50cdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 *.vcxproj
 *.filters
 *.sln
+*.user
 
 bin/
 lib/
@@ -49,5 +50,6 @@ conanbuildinfo\.cmake
 conaninfo\.txt
 conanbuildinfo\.txt
 conan_imports_manifest\.txt
+package/
 
 oclint/