Merge branch 'master' into linux

.gitignore

@@ -7,6 +7,17 @@
 *.bmp
 *.lproj
 
+*.tmp
+*.vcxproj
+*.filters
+*.sln
+*.user
+
+bin/
+lib/
+oneshot\.dir/
+x64/
+
 Makefile*
 
 /oneshot
@@ -34,11 +45,11 @@ OneShot
 .qmake.stash
 CMakeCache.txt
 CMakeFiles/
+cmake_install\.cmake
 conanbuildinfo\.cmake
 conaninfo\.txt
 conanbuildinfo\.txt
-cmake_install\.cmake
+conan_imports_manifest\.txt
+package/
 
 oclint/
-
-*.tmp

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)

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