jprdonnelly/fallout1-ce
1
0
Fork 0
mirror of https://github.com/alexbatalov/fallout1-ce.git synced 2025-12-19 09:50:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reconcile macOS/iOS/CI stuff with F2CE

Browse Source
This commit is contained in:
Alexander Batalov
2025-01-15 20:47:06 +03:00
parent fbd25f00e9
commit 7c8f694abe
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci-build.yml vendored
View File

@@ -90,7 +90,7 @@ jobs:
ios:
name: iOS
runs-on: macos-12
runs-on: macos-13
steps:
- name: Clone
@@ -204,7 +204,7 @@ jobs:
macos:
name: macOS
runs-on: macos-11
runs-on: macos-13
steps:
- name: Clone

4
CMakeLists.txt
View File

@@ -6,10 +6,10 @@ set(EXECUTABLE_NAME fallout-ce)
if (APPLE)
if(IOS)
set(CMAKE_OSX_DEPLOYMENT_TARGET "11" CACHE STRING "")
set(CMAKE_OSX_DEPLOYMENT_TARGET "12" CACHE STRING "")
set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "")
else()
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "")
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "")
endif()
endif()

2
src/game/anim.h
View File

@@ -91,7 +91,7 @@ typedef enum AnimationType {
LAST_SF_DEATH_ANIM = ANIM_FALL_FRONT_BLOOD_SF,
} AnimationType;
#define FID_ANIM_TYPE(value) ((value)&0xFF0000) >> 16
#define FID_ANIM_TYPE(value) ((value) & 0xFF0000) >> 16
// Signature of animation callback accepting 2 parameters.
typedef int AnimationCallback(void*, void*);

2
src/game/object_types.h
View File

@@ -29,7 +29,7 @@ enum {
OBJ_TYPE_COUNT,
};
#define FID_TYPE(value) ((value)&0xF000000) >> 24
#define FID_TYPE(value) ((value) & 0xF000000) >> 24
#define PID_TYPE(value) (value) >> 24
#define SID_TYPE(value) (value) >> 24