From 3011911f801c633df6c8cf1484442d88933a7577 Mon Sep 17 00:00:00 2001
From: Charlie Bruce <charliebruce@gmail.com>
Date: Sat, 11 Jan 2020 03:09:42 +0000
Subject: [PATCH 1/4] Revert C++11 code to older standard for improved
 compatibility

---
 desktop_version/src/Graphics.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp
index aa7381f3..52e4eb85 100644
--- a/desktop_version/src/Graphics.cpp
+++ b/desktop_version/src/Graphics.cpp
@@ -105,15 +105,15 @@ Graphics::Graphics()
 
     // initialize everything else to zero
     backBuffer = nullptr;
-    backboxrect = SDL_Rect{ 0, 0, 0, 0 };
+    backboxrect.x = 0, backboxrect.y = 0, backboxrect.w = 0, backboxrect.h = 0; 
     bcol = 0;
     bcol2 = 0;
-    ct = colourTransform{ 0 };
-    foot_rect = SDL_Rect{ 0, 0, 0, 0 };
+    ct.colour = 0;
+    foot_rect.x = 0, foot_rect.y = 0, foot_rect.w = 0, foot_rect.h = 0;
     foregrounddrawn = false;
     foregroundBuffer = nullptr;
     backgrounddrawn = false;
-    images_rect = SDL_Rect{ 0, 0, 0, 0 };
+    images_rect.x = 0, images_rect.y = 0, images_rect.w = 0, images_rect.h = 0;
     j = 0;
     k = 0;
     m = 0;
@@ -121,12 +121,12 @@ Graphics::Graphics()
     menubuffer = nullptr;
     screenbuffer = nullptr;
     tempBuffer = nullptr;
-    tl = point{ 0, 0 };
+    tl.x = 0, tl.y = 0;
     towerbuffer = nullptr;
     trinketr = 0;
     trinketg = 0;
     trinketb = 0;
-    warprect = SDL_Rect{ 0, 0, 0, 0 };
+    warprect.x = 0, warprect.y = 0, warprect.w = 0, warprect.h = 0;
 }
 
 Graphics::~Graphics()

From 1a6ce2617a1177b1eb46fa4d859337b96ee5d643 Mon Sep 17 00:00:00 2001
From: Charlie Bruce <charliebruce@gmail.com>
Date: Fri, 10 Jan 2020 20:12:23 +0000
Subject: [PATCH 2/4] On macOS, use default SDK if version 10.9 is not
 installed.

---
 desktop_version/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/desktop_version/CMakeLists.txt b/desktop_version/CMakeLists.txt
index 6a0a301f..6c562233 100644
--- a/desktop_version/CMakeLists.txt
+++ b/desktop_version/CMakeLists.txt
@@ -11,7 +11,8 @@ IF(APPLE)
 	IF(IS_DIRECTORY ${OSX_10_9_SDK_PATH})
 		SET(CMAKE_OSX_SYSROOT ${OSX_10_9_SDK_PATH})
 	ELSE()
-		MESSAGE(WARNING "macOS 10.9 SDK not found, expect badness!")
+		MESSAGE(WARNING "macOS 10.9 SDK not found - proceeding with the default SDK. This may cause issues!")
+		SET(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
 	ENDIF()
 	MESSAGE(STATUS "Using macOS SDK at ${CMAKE_OSX_SYSROOT}")
 	SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)

From d6392ccbe359eb9e0fb7455b16a85f930ef09aaf Mon Sep 17 00:00:00 2001
From: Charlie Bruce <charliebruce@gmail.com>
Date: Sat, 11 Jan 2020 04:24:41 +0000
Subject: [PATCH 3/4] Move PROJECT line after CMAKE_OSX_DEPLOYMENT_TARGET line

This is suggested by the documentation: https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_DEPLOYMENT_TARGET.html
---
 desktop_version/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/desktop_version/CMakeLists.txt b/desktop_version/CMakeLists.txt
index 6c562233..e174fa84 100644
--- a/desktop_version/CMakeLists.txt
+++ b/desktop_version/CMakeLists.txt
@@ -2,7 +2,6 @@
 # Written by Ethan "flibitijibibo" Lee
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
-PROJECT(VVVVVV)
 
 # Architecture Flags
 IF(APPLE)
@@ -20,6 +19,8 @@ IF(APPLE)
 	ADD_COMPILE_OPTIONS(-Werror=partial-availability)
 ENDIF()
 
+PROJECT(VVVVVV)
+
 # Compiler Flags
 ADD_DEFINITIONS(-DPHYSFS_SUPPORTS_DEFAULT=0 -DPHYSFS_SUPPORTS_ZIP=1)
 

From 8595626eb1f1dbd2ee9e399f4a4bf8eb3f81dc34 Mon Sep 17 00:00:00 2001
From: Charlie Bruce <charliebruce@gmail.com>
Date: Sat, 11 Jan 2020 05:03:45 +0000
Subject: [PATCH 4/4] Add myself to CONTRIBUTORS

---
 desktop_version/CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/desktop_version/CONTRIBUTORS.txt b/desktop_version/CONTRIBUTORS.txt
index 882185c2..40df2f1b 100644
--- a/desktop_version/CONTRIBUTORS.txt
+++ b/desktop_version/CONTRIBUTORS.txt
@@ -4,6 +4,7 @@ Contributors
 (Ordered alphabetically by last name.)
 
 * Christoph Böhmwalder (@chrboe)
+* Charlie Bruce (@charliebruce)
 * Daniel Lee (@ddm999)
 * Elliott Saltar (@eboyblue3)
 * Marvin Scholz (@ePirat)