remove Xcode project, update CI, update readme (OpenRCT2#15553)

atmaxinger · Oct 10, 2021 · ece6df3 · ece6df3
1 parent a577277
commit ece6df3
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 5,214 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -115,36 +115,6 @@ jobs:
           name: OpenRCT2-${{ matrix.platform }}
           path: bin/openrct2.exe
           if-no-files-found: error
-  macos-xcode:
-    name: macOS (x64) using Xcode
-    runs-on: macos-latest
-    needs: check-code-formatting
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build OpenRCT2
-        run: |
-          . scripts/setenv
-          xcodebuild -configuration Release
-          mkdir -p artifacts
-          mv build/Release/OpenRCT2.app artifacts
-          echo -e "\033[0;36mCompressing OpenRCT2.app...\033[0m"
-          cd artifacts
-          zip -rq openrct2-macos.zip OpenRCT2.app
-      - name: Upload artifacts (CI)
-        uses: actions/upload-artifact@v2
-        with:
-          name: OpenRCT2-${{ runner.os }}-xcode
-          path: artifacts/openrct2-macos.zip
-          if-no-files-found: error
-      - name: Upload artifacts (openrct2.org)
-        run: |
-          . scripts/setenv
-          if [[ "$OPENRCT2_PUSH" == "true" ]]; then
-              upload-build artifacts/openrct2-macos.zip macos $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
-          else
-              echo 'Not going to push build'
-          fi
   macos-cmake:
     name: macOS (${{ matrix.arch }}) using CMake
     runs-on: macos-latest
@@ -230,6 +200,14 @@ jobs:
           name: OpenRCT2-${{ runner.os }}-universal
           path: artifacts/openrct2-macos.zip
           if-no-files-found: error
+      - name: Upload artifacts (openrct2.org)
+        run: |
+          . scripts/setenv
+          if [[ "$OPENRCT2_PUSH" == "true" ]]; then
+              upload-build artifacts/openrct2-macos.zip macos $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
+          else
+              echo 'Not going to push build'
+          fi
   linux-portable:
     name: Linux (${{ matrix.platform }}, portable)
     runs-on: ubuntu-latest

diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj
diff --git a/OpenRCT2.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/OpenRCT2.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/OpenRCT2.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/OpenRCT2.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/OpenRCT2.xcodeproj/project.xcworkspace/xcshareddata/OpenRCT2.xcscmblueprint b/OpenRCT2.xcodeproj/project.xcworkspace/xcshareddata/OpenRCT2.xcscmblueprint
diff --git a/OpenRCT2.xcodeproj/xcshareddata/xcschemes/OpenRCT2.xcscheme b/OpenRCT2.xcodeproj/xcshareddata/xcschemes/OpenRCT2.xcscheme
diff --git a/OpenRCT2.xcodeproj/xcshareddata/xcschemes/PaintTest.xcscheme b/OpenRCT2.xcodeproj/xcshareddata/xcschemes/PaintTest.xcscheme
diff --git a/readme.md b/readme.md
@@ -92,10 +92,6 @@ OpenRCT2 requires original files of RollerCoaster Tycoon 2 to play. It can be bo
   - Desktop development with C++
 
 ### macOS:
-- Xcode 10+
-
-The program can also be built as a command line program using CMake. This type of build requires:
-
 - Xcode Command Line Tools
 - [Homebrew](https://brew.sh)
 - CMake (available through Homebrew)
@@ -143,20 +139,28 @@ msbuild openrct2.proj /t:PublishPortable
 ```
 
 ### macOS:
-#### Xcode:
-The recommended way of building OpenRCT2 for macOS is with Xcode. The Xcode build will create a self-contained application bundles which include all the necessary game files and dependencies. Open the project file OpenRCT2.xcodeproj in Xcode and build from there. Building this way will handle the dependencies for you automatically. You can also invoke an Xcode build from the command line using `xcodebuild`.
-
 #### CMake:
-A command line version of OpenRCT2 can be built using CMake. CMake will retrieve the dependences from [Dependencies](https://github.com/OpenRCT2/Dependencies/) automatically. You can build the project using CMake using the following commands:
+The recommended way of building OpenRCT2 for macOS is with CMake. CMake can build either a self-contained application bundles which include all the necessary game files and dependencies, or it can build a command line version that links against system installed dependencies. CMake will retrieve the dependences from [Dependencies](https://github.com/OpenRCT2/Dependencies/) automatically. You can build the macOS app using CMake using the following commands:
 ```
 mkdir build
 cd build
 cmake ..
+make install
+```
+Then you can run the game by opening `OpenRCT2.app`
+
+To build the command line version, you'll need to disable the macOS app bundle:
+```
+mkdir build
+cd build
+cmake .. -DMACOS_BUNDLE=off
 make
 ln -s ../data data
 ```
 Then you can run the game by running `./openrct2`.
 
+To link against system dependencies instead of letting CMake download the dependencies from [Dependencies](https://github.com/OpenRCT2/Dependencies), add `-DMACOS_USE_DEPENDENCIES=off` to your cmake args.
+
 Detailed instructions can be found on [Building OpenRCT2 on macOS using CMake](https://github.com/OpenRCT2/OpenRCT2/wiki/Building-OpenRCT2-on-macOS-using-CMake).
 
 ### Linux: