From a86b1d8d29f63d7e51311a2293f47ee66a3e017d Mon Sep 17 00:00:00 2001
From: Vinyl Darkscratch <vinyldarkscratch@gmail.com>
Date: Sat, 6 Oct 2018 18:21:00 -0700
Subject: [PATCH 1/3] Fix Steamshim path

---
 CMakeLists.txt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f4319e..6c54da5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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,8 @@ add_executable(steamshim
 	${STEAMSHIM_SOURCES}
 )
 
-target_link_libraries(steamshim steam_api)
+IF(WIN32)
+	target_link_libraries(steamshim steam_api64)
+ELSE()
+	target_link_libraries(steamshim steam_api)
+ENDIF()

From bcb9b838f25f75d34465de82204fc33a7ebece7d Mon Sep 17 00:00:00 2001
From: Vinyl Darkscratch <vinyldarkscratch@gmail.com>
Date: Sat, 6 Oct 2018 18:23:56 -0700
Subject: [PATCH 2/3] Temporarily disable CMake Steamshim on Windows

---
 CMakeLists.txt | 57 +++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c54da5..7dbe084 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -314,36 +314,37 @@ IF(APPLE)
 ENDIF()
 
 # Steamshim
+IF(NOT WIN32)
+	set(STEAMSHIM_SOURCES
+		steamshim_parent/steamshim_parent.cpp
+	)
 
-set(STEAMSHIM_SOURCES
-	steamshim_parent/steamshim_parent.cpp
-)
+	include_directories(${STEAMWORKS_PATH}/public)
 
-include_directories(${STEAMWORKS_PATH}/public)
+	add_definitions(-DGAME_LAUNCH_NAME="${GAME_LAUNCH_NAME}")
 
-add_definitions(-DGAME_LAUNCH_NAME="${GAME_LAUNCH_NAME}")
+	IF(DEBUG)
+		add_definitions(-DSTEAMSHIM_DEBUG)
+	ENDIF()
 
-IF(DEBUG)
-	add_definitions(-DSTEAMSHIM_DEBUG)
-ENDIF()
-
-IF(APPLE)
-	link_directories(${STEAMWORKS_PATH}/redistributable_bin/osx32)
-ELSEIF(WIN32)
-	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)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
-ENDIF()
-
-add_executable(steamshim
-	${STEAMSHIM_SOURCES}
-)
-
-IF(WIN32)
-	target_link_libraries(steamshim steam_api64)
-ELSE()
-	target_link_libraries(steamshim steam_api)
+	IF(APPLE)
+		link_directories(${STEAMWORKS_PATH}/redistributable_bin/osx32)
+	ELSEIF(WIN32)
+		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)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
+	ENDIF()
+
+	add_executable(steamshim
+		${STEAMSHIM_SOURCES}
+	)
+
+	IF(WIN32)
+		target_link_libraries(steamshim steam_api64)
+	ELSE()
+		target_link_libraries(steamshim steam_api)
+	ENDIF()
 ENDIF()

From 183e1e8ecca1037c9a63703198a6c3330d0d2bba Mon Sep 17 00:00:00 2001
From: Vinyl Darkscratch <vinyldarkscratch@gmail.com>
Date: Sat, 6 Oct 2018 18:24:56 -0700
Subject: [PATCH 3/3] Update .gitignore

---
 .gitignore | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9db0bfd..d0755b1 100644
--- a/.gitignore
+++ b/.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/
+steamworks/
\ No newline at end of file