From bc36ee973c5d15ea40e619d087fdcff82e264dee Mon Sep 17 00:00:00 2001 From: Andrew Rimpici Date: Fri, 9 Aug 2019 03:33:10 -0400 Subject: [PATCH] Xcode fixes for macOS support Added in Duncan's files to the xcode project so the project builds correctly on Mac. --- OpenRCT2.xcodeproj/project.pbxproj | 20 ++++++++++++++++++++ contributors.md | 1 + 2 files changed, 21 insertions(+) diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 06bc9d7d73..3b7144d171 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -21,6 +21,10 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 01C6F0C222FD519E0057E2F7 /* TrackImporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C6F0C022FD519E0057E2F7 /* TrackImporter.cpp */; }; + 01C6F0C422FD51B70057E2F7 /* T4Importer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C6F0C322FD51B70057E2F7 /* T4Importer.cpp */; }; + 01C6F0C822FD51FC0057E2F7 /* T6Exporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C6F0C522FD51FC0057E2F7 /* T6Exporter.cpp */; }; + 01C6F0C922FD51FC0057E2F7 /* T6Importer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C6F0C622FD51FC0057E2F7 /* T6Importer.cpp */; }; 2A1F4FE0221FF4B0003CA045 /* Twitch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C840F1EC4E7CC00FA49E2 /* Twitch.cpp */; }; 2A1F4FE1221FF4B0003CA045 /* Audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83571EC4E7CC00FA49E2 /* Audio.cpp */; }; 2A1F4FE2221FF4B0003CA045 /* macos.mm in Sources */ = {isa = PBXBuildFile; fileRef = F76C845D1EC4E7CC00FA49E2 /* macos.mm */; }; @@ -620,6 +624,12 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 01C6F0C022FD519E0057E2F7 /* TrackImporter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrackImporter.cpp; sourceTree = ""; }; + 01C6F0C122FD519E0057E2F7 /* TrackImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackImporter.h; sourceTree = ""; }; + 01C6F0C322FD51B70057E2F7 /* T4Importer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = T4Importer.cpp; sourceTree = ""; }; + 01C6F0C522FD51FC0057E2F7 /* T6Exporter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = T6Exporter.cpp; sourceTree = ""; }; + 01C6F0C622FD51FC0057E2F7 /* T6Importer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = T6Importer.cpp; sourceTree = ""; }; + 01C6F0C722FD51FC0057E2F7 /* T6Exporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = T6Exporter.h; sourceTree = ""; }; 2A5354E822099C4F00A5440F /* Network.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Network.cpp; sourceTree = ""; }; 2A5354EA22099C7200A5440F /* CircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircularBuffer.h; sourceTree = ""; }; 2ADE2F21224418B1002598AF /* Random.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Random.hpp; sourceTree = ""; }; @@ -2496,6 +2506,8 @@ F76C83551EC4E7CC00FA49E2 /* libopenrct2 */ = { isa = PBXGroup; children = ( + 01C6F0C022FD519E0057E2F7 /* TrackImporter.cpp */, + 01C6F0C122FD519E0057E2F7 /* TrackImporter.h */, C9C630B52235A22C009AD16E /* GameStateSnapshots.cpp */, C9C630B42235A22C009AD16E /* GameStateSnapshots.h */, 4C358E5021C445F700ADE6BC /* ReplayManager.cpp */, @@ -2947,6 +2959,7 @@ F76C84661EC4E7CC00FA49E2 /* rct1 */ = { isa = PBXGroup; children = ( + 01C6F0C322FD51B70057E2F7 /* T4Importer.cpp */, 4C7B54022004C57400A52E21 /* RCT1.h */, F76C84671EC4E7CC00FA49E2 /* S4Importer.cpp */, F76C84681EC4E7CC00FA49E2 /* Tables.cpp */, @@ -2975,6 +2988,9 @@ F76C84761EC4E7CC00FA49E2 /* rct2 */ = { isa = PBXGroup; children = ( + 01C6F0C522FD51FC0057E2F7 /* T6Exporter.cpp */, + 01C6F0C722FD51FC0057E2F7 /* T6Exporter.h */, + 01C6F0C622FD51FC0057E2F7 /* T6Importer.cpp */, 4C7B54042004C58200A52E21 /* RCT2.h */, F76C847D1EC4E7CC00FA49E2 /* S6Exporter.cpp */, F76C847E1EC4E7CC00FA49E2 /* S6Exporter.h */, @@ -3831,6 +3847,7 @@ 4C93F1AF1F8CD9F600A9330D /* KeyboardShortcut.cpp in Sources */, C654DF3D1F69C0430040F43D /* TrackDesignPlace.cpp in Sources */, C666EE721F37ACB10061AA04 /* Multiplayer.cpp in Sources */, + 01C6F0C822FD51FC0057E2F7 /* T6Exporter.cpp in Sources */, C654DF371F69C0430040F43D /* Sign.cpp in Sources */, 93CBA4C920A7504500867D56 /* ImageImporter.cpp in Sources */, 933CBDB620CB1ACD00134678 /* Theme.cpp in Sources */, @@ -3862,9 +3879,11 @@ C666ED761F33DBB20061AA04 /* ShortcutKeyChange.cpp in Sources */, C685E51C1F8907850090598F /* Map.cpp in Sources */, F7CB864A1EEDA1330030C877 /* KeyboardShortcuts.cpp in Sources */, + 01C6F0C922FD51FC0057E2F7 /* T6Importer.cpp in Sources */, C654DF381F69C0430040F43D /* StaffFirePrompt.cpp in Sources */, C68313D51FDB4F4C006DB3D8 /* Graph.cpp in Sources */, C685E51D1F8907850090598F /* Research.cpp in Sources */, + 01C6F0C422FD51B70057E2F7 /* T4Importer.cpp in Sources */, C64644FB1F3FA4120026AC2D /* EditorScenarioOptions.cpp in Sources */, 93F60050213DD7E400EEB83E /* StationObject.cpp in Sources */, C654DF321F69C0430040F43D /* InstallTrack.cpp in Sources */, @@ -3891,6 +3910,7 @@ C68878C320289B710084B384 /* DrawRectShader.cpp in Sources */, C666EE751F37ACB10061AA04 /* NewsOptions.cpp in Sources */, C654DF311F69C0430040F43D /* GuestList.cpp in Sources */, + 01C6F0C222FD519E0057E2F7 /* TrackImporter.cpp in Sources */, 4C93F1AD1F8CD9F000A9330D /* Input.cpp in Sources */, C666EE761F37ACB10061AA04 /* Options.cpp in Sources */, 2A5354E922099C4F00A5440F /* Network.cpp in Sources */, diff --git a/contributors.md b/contributors.md index 8b4557af20..ae7682d7a7 100644 --- a/contributors.md +++ b/contributors.md @@ -78,6 +78,7 @@ The following people are not part of the development team, but have been contrib * Olivier Wervers (oli414) - Remove unused objects command, various bugfixes * Christian Schubert (Osmodium) - Ensuring custom user content folders, incl. open folder. * (Xkeeper0) - Improved banner tooltips; multiplayer status in toolbar. +* Andrew Rimpici (Andy608) - Xcode fixes for macOS support. ## Bug fixes * (halfbro)