eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Apple Silicon support (#86)

This commit is contained in:
Alexander Batalov 2022-07-24 15:52:29 +03:00 committed by GitHub
parent 365805afe8
commit 032969ce5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/Build.yml vendored
View File

@ -111,15 +111,11 @@ jobs:
- name: Clone - name: Clone
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Dependencies
run: |
brew install sdl2
- name: Cache cmake build - name: Cache cmake build
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: build path: build
key: macos-cmake-v1 key: macos-cmake-v2
- name: Configure - name: Configure
run: | run: |

6
.github/workflows/release.yml vendored
View File

@ -85,10 +85,6 @@ jobs:
- name: Clone - name: Clone
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Dependencies
run: |
brew install sdl2
- name: Import code signing certificates - name: Import code signing certificates
uses: apple-actions/import-codesign-certs@v1 uses: apple-actions/import-codesign-certs@v1
with: with:
@ -99,7 +95,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: build path: build
key: macos-cmake-v1 key: macos-cmake-v2
- name: Configure - name: Configure
run: | run: |

8
CMakeLists.txt
View File

@ -4,6 +4,11 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
set(EXECUTABLE_NAME fallout2-ce) 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}) project(${EXECUTABLE_NAME})
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
@ -268,14 +273,13 @@ if(APPLE)
set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.alexbatalov.fallout2-ce") set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.alexbatalov.fallout2-ce")
set(MACOSX_BUNDLE_BUNDLE_NAME "${EXECUTABLE_NAME}") set(MACOSX_BUNDLE_BUNDLE_NAME "${EXECUTABLE_NAME}")
set(MACOSX_BUNDLE_DISPLAY_NAME "Fallout 2") set(MACOSX_BUNDLE_DISPLAY_NAME "Fallout 2")
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
endif() endif()
add_subdirectory("third_party/fpattern") add_subdirectory("third_party/fpattern")
target_link_libraries(${EXECUTABLE_NAME} ${FPATTERN_LIBRARY}) target_link_libraries(${EXECUTABLE_NAME} ${FPATTERN_LIBRARY})
target_include_directories(${EXECUTABLE_NAME} PRIVATE ${FPATTERN_INCLUDE_DIR}) 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/zlib")
add_subdirectory("third_party/sdl2") add_subdirectory("third_party/sdl2")
else() else()

2
README.md
View File

@ -24,7 +24,7 @@ $ sudo apt install libsdl2-2.0-0
### macOS ### 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`. - Use Windows installation as a base - it contains data assets needed to play. Copy `Fallout2` folder somewhere, for example `/Applications/Fallout2`.