Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add Apple Silicon support #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 24, 2022
Merged

Add Apple Silicon support #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed680f6
Build for Apple Silicon
alexbatalov Jul 24, 2022
ac84db2
Update cache, remove brewed sdl2
alexbatalov Jul 24, 2022
b968392
Update readme
alexbatalov Jul 24, 2022
29eb569
Update release workflow
alexbatalov Jul 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/Build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,11 @@ jobs:
- name: Clone
uses: actions/checkout@v3

- name: Dependencies
run: |
brew install sdl2

- name: Cache cmake build
uses: actions/cache@v3
with:
path: build
key: macos-cmake-v1
key: macos-cmake-v2

- name: Configure
run: |
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,6 @@ jobs:
- name: Clone
uses: actions/checkout@v3

- name: Dependencies
run: |
brew install sdl2

- name: Import code signing certificates
uses: apple-actions/import-codesign-certs@v1
with:
Expand All @@ -99,7 +95,7 @@ jobs:
uses: actions/cache@v3
with:
path: build
key: macos-cmake-v1
key: macos-cmake-v2

- name: Configure
run: |
Expand Down
8 changes: 6 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)

set(EXECUTABLE_NAME fallout2-ce)

if (APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "")
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "")
endif()

project(${EXECUTABLE_NAME})

set(CMAKE_CXX_STANDARD 17)
Expand Down Expand Up @@ -268,14 +273,13 @@ if(APPLE)
set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.alexbatalov.fallout2-ce")
set(MACOSX_BUNDLE_BUNDLE_NAME "${EXECUTABLE_NAME}")
set(MACOSX_BUNDLE_DISPLAY_NAME "Fallout 2")
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
endif()

add_subdirectory("third_party/fpattern")
target_link_libraries(${EXECUTABLE_NAME} ${FPATTERN_LIBRARY})
target_include_directories(${EXECUTABLE_NAME} PRIVATE ${FPATTERN_INCLUDE_DIR})

if(NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_subdirectory("third_party/zlib")
add_subdirectory("third_party/sdl2")
else()
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ $ sudo apt install libsdl2-2.0-0

### macOS

> **NOTE**: macOS 11 or higher is required. The app is not universal. It should run on Apple Silicon under Rosetta 2, but I haven't tried it.
> **NOTE**: macOS 11 or higher is required.

- Use Windows installation as a base - it contains data assets needed to play. Copy `Fallout2` folder somewhere, for example `/Applications/Fallout2`.

Expand Down