From 86a9e1ece17694a8e2374022ac22b06ec92f8bbf Mon Sep 17 00:00:00 2001
From: Vinyl Darkscratch <vinyldarkscratch@gmail.com>
Date: Sat, 6 Oct 2018 18:27:51 -0700
Subject: [PATCH 1/4] Remove Info.plist

---
 Info.plist | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 Info.plist

diff --git a/Info.plist b/Info.plist
deleted file mode 100644
index 6c19ba0..0000000
--- a/Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleGetInfoString</key>
-	<string>Created by Qt/QMake</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleExecutable</key>
-	<string>OneShot</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>NOTE</key>
-	<string>This file was generated by Qt/QMake.</string>
-</dict>
-</plist>

From 02c9c6f6e4b8b1f6894bb353bcc129fe9c32c9da Mon Sep 17 00:00:00 2001
From: Vinyl Darkscratch <vinyldarkscratch@gmail.com>
Date: Sat, 6 Oct 2018 19:31:58 -0700
Subject: [PATCH 2/4] Disable redundant JPG support

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index bebb63d..c7af9b7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -252,7 +252,7 @@ int main(int argc, char *argv[])
 	if (conf.windowTitle.empty())
 		conf.windowTitle = conf.game.title;
 
-	int imgFlags = IMG_INIT_PNG | IMG_INIT_JPG;
+	int imgFlags = IMG_INIT_PNG;
 	if (IMG_Init(imgFlags) != imgFlags)
 	{
 		showInitError(std::string("Error initializing SDL_image: ") + SDL_GetError());

From ba53c209723cdcfe2feaf884448a1435cb2fa5ad Mon Sep 17 00:00:00 2001
From: Vinyl Darkscratch <vinyldarkscratch@gmail.com>
Date: Sun, 7 Oct 2018 10:09:50 -0700
Subject: [PATCH 3/4] Update CMakeLists for Steamshim

---
 CMakeLists.txt                  |  4 ++--
 steamshim_parent/CMakeLists.txt | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dbe084..beab52f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,8 @@ conan_basic_setup()
 
 ## Setup options ##
 
-option(STEAM "Build for Steam" ON)
-set(STEAMWORKS_PATH "${CMAKE_BINARY_DIR}/steamworks" CACHE PATH "Path to Steamworks folder")
+option(STEAM "Build for Steam" OFF)
+set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/steamworks" CACHE PATH "Path to Steamworks folder")
 option(DEBUG "Debug mode" OFF)
 
 ## Misc setup ##
diff --git a/steamshim_parent/CMakeLists.txt b/steamshim_parent/CMakeLists.txt
index cbc3a4e..3c25ad2 100644
--- a/steamshim_parent/CMakeLists.txt
+++ b/steamshim_parent/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8.11)
 
-set(STEAMWORKS_PATH "" CACHE PATH "Path to Steamworks folder")
+set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../steamworks" CACHE PATH "Path to Steamworks folder")
 set(GAME_LAUNCH_NAME "oneshot" CACHE STRING "Game launch name")
 option(DEBUG "Debug mode" OFF)
 
@@ -20,7 +20,7 @@ IF(APPLE)
 	link_directories(${STEAMWORKS_PATH}/redistributable_bin/osx32)
 ELSEIF(WIN32)
 	list(APPEND SOURCES resources.rc)
-	link_directories(${STEAMWORKS_PATH}/redistributable_bin)
+	link_directories(${STEAMWORKS_PATH}/redistributable_bin/win64)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mwindows")
 ELSEIF(LINUX)
 	link_directories(${STEAMWORKS_PATH}/redistributable_bin/linux64)
@@ -31,4 +31,8 @@ add_executable(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 87d40559fdce6acbd6476fbda5f55c602976f827 Mon Sep 17 00:00:00 2001
From: Vinyl Darkscratch <vinyldarkscratch@gmail.com>
Date: Sun, 7 Oct 2018 10:09:58 -0700
Subject: [PATCH 4/4] Use normal Ruby

---
 conanfile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conanfile.py b/conanfile.py
index 2aa3874..f0eace2 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -16,7 +16,7 @@ class MkxpConan(ConanFile):
         "openal/1.18.2@bincrafters/stable",
         "physfs/3.0.1@eliza/stable",
         "pixman/0.34.0@bincrafters/stable",
-        "ruby-mkxp/2.5.1@eliza/stable",
+        "ruby/2.5.1@eliza/stable",
         "sdl2/2.0.8@bincrafters/stable",
         "sdl2_image/2.0.3@bincrafters/stable",
         "sdl2_ttf/2.0.14@eliza/stable",