Skip to content

Commit

Permalink
mac prefab builds now require apple silicon
Browse files Browse the repository at this point in the history
  • Loading branch information
efroemling committed Nov 11, 2024
1 parent 8c8dcbf commit 06e2088
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 35 deletions.
56 changes: 24 additions & 32 deletions .efrocachemap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### 1.7.37 (build 22091, api 9, 2024-11-11)
### 1.7.37 (build 22094, api 9, 2024-11-11)
- Bumping api version to 9. As you'll see below, there's some UI changes that
will require a bit of work for any UI mods to adapt to. If your mods don't
touch UI stuff at all you can simply bump your api version and call it a day.
Expand Down Expand Up @@ -147,6 +147,11 @@
connections are being blocked. Do not enable this if you don't need to.
- (build 22085) Added protection against an attack consisting of spamming
invalid game-query packets.
- Using prefab builds on a Mac now requires an Apple Silicon machine (M1 or
newer). Mac x86 prefab builds were becoming a major bottleneck in pushing out
updates. Please let me know if you are making substantial use of prefab builds
on an x86 Mac and I can reconsider. Note that this only concerns the prefab
build system; regular official game builds still fully support x86 Macs.

### 1.7.36 (build 21944, api 8, 2024-07-26)
- Wired up Tokens, BombSquad's new purchasable currency. The first thing these
Expand Down
2 changes: 1 addition & 1 deletion src/assets/ba_data/python/baenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

# Build number and version of the ballistica binary we expect to be
# using.
TARGET_BALLISTICA_BUILD = 22091
TARGET_BALLISTICA_BUILD = 22094
TARGET_BALLISTICA_VERSION = '1.7.37'


Expand Down
2 changes: 1 addition & 1 deletion src/ballistica/shared/ballistica.cc
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
namespace ballistica {

// These are set automatically via script; don't modify them here.
const int kEngineBuildNumber = 22091;
const int kEngineBuildNumber = 22094;
const char* kEngineVersion = "1.7.37";
const int kEngineApiVersion = 9;

Expand Down
4 changes: 4 additions & 0 deletions tools/batools/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ def get_current(

if system == 'Darwin':
if machine == 'x86_64':
if bool(True):
raise CleanError(
'Prefab builds now require an Apple Silicon mac.'
)
return cls.MAC_X86_64
if machine == 'arm64':
return cls.MAC_ARM64
Expand Down
1 change: 1 addition & 0 deletions tools/batools/pcommands.py
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,7 @@ def make_prefab() -> None:

if len(sys.argv) != 3:
raise RuntimeError('Expected one argument')

targetstr = PrefabTarget(sys.argv[2]).value
platformstr = PrefabPlatform.get_current().value

Expand Down

0 comments on commit 06e2088

Please sign in to comment.