Merge branch 'master' into qmake-to-cmake

.gitignore

@@ -15,7 +15,7 @@
 
 bin/
 lib/
-oneshot\.dir/
+*.dir/
 x64/
 
 Makefile*
@@ -28,6 +28,7 @@ __pycache__
 /dist
 /debug
 /release
+steamshim_parent/build/
 
 object_script.*
 rpgscript.bat
@@ -54,6 +55,4 @@ package/
 
 oclint/
 
-steamshim_parent/build/
-
 steamworks/

CMakeLists.txt

@@ -314,7 +314,7 @@ IF(APPLE)
 ENDIF()
 
 # Steamshim
-
+IF(NOT WIN32)
 	set(STEAMSHIM_SOURCES
 		steamshim_parent/steamshim_parent.cpp
 	)
@@ -330,8 +330,8 @@ ENDIF()
 	IF(APPLE)
 		link_directories(${STEAMWORKS_PATH}/redistributable_bin/osx32)
 	ELSEIF(WIN32)
-	list(APPEND STEAMSHIM_SOURCES resources.rc)
-	link_directories(${STEAMWORKS_PATH}/redistributable_bin)
+		list(APPEND STEAMSHIM_SOURCES steamshim_parent/resources.rc)
+		link_directories(${STEAMWORKS_PATH}/redistributable_bin/win64)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mwindows")
 	ELSEIF(LINUX)
 		link_directories(${STEAMWORKS_PATH}/redistributable_bin/linux64)
@@ -342,4 +342,9 @@ add_executable(steamshim
 		${STEAMSHIM_SOURCES}
 	)
 
+	IF(WIN32)
+		target_link_libraries(steamshim steam_api64)
+	ELSE()
 		target_link_libraries(steamshim steam_api)
+	ENDIF()
+ENDIF()