diff --git a/desktop_version/CMakeLists.txt b/desktop_version/CMakeLists.txt index 6a0a301f..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) @@ -11,7 +10,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) @@ -19,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) diff --git a/desktop_version/CONTRIBUTORS.txt b/desktop_version/CONTRIBUTORS.txt index 23f41400..154fc415 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) * Brian Callahan (@ibara) * Daniel Lee (@ddm999) * Elliott Saltar (@eboyblue3) 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()