mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-29 15:11:58 +00:00
build script: make cross-compilation of jpeg-turbo platform agnostic
This commit is contained in:
parent
1f9e17fc4f
commit
7ea4611887
1 changed files with 5 additions and 2 deletions
7
build.py
7
build.py
|
@ -29,6 +29,7 @@ import collections
|
||||||
import copy
|
import copy
|
||||||
import hashlib
|
import hashlib
|
||||||
import os
|
import os
|
||||||
|
from platform import machine
|
||||||
import re
|
import re
|
||||||
import shutil
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
|
@ -941,10 +942,12 @@ class JpegTurboTarget(CMakeStaticDependencyTarget):
|
||||||
'd74b92ac33b0e3657123ddcf6728788c90dc84dcb6a52013d758af3c4af481bb')
|
'd74b92ac33b0e3657123ddcf6728788c90dc84dcb6a52013d758af3c4af481bb')
|
||||||
|
|
||||||
def configure(self, builder: 'Builder'):
|
def configure(self, builder: 'Builder'):
|
||||||
if builder.architecture() == 'arm64':
|
architecture = builder.architecture()
|
||||||
|
|
||||||
|
if architecture != machine():
|
||||||
opts = self.options
|
opts = self.options
|
||||||
opts['CMAKE_SYSTEM_NAME'] = 'Darwin'
|
opts['CMAKE_SYSTEM_NAME'] = 'Darwin'
|
||||||
opts['CMAKE_SYSTEM_PROCESSOR'] = 'aarch64'
|
opts['CMAKE_SYSTEM_PROCESSOR'] = 'aarch64' if architecture == 'arm64' else architecture
|
||||||
opts['CMAKE_AR'] = '/usr/bin/ar'
|
opts['CMAKE_AR'] = '/usr/bin/ar'
|
||||||
|
|
||||||
super().configure(builder)
|
super().configure(builder)
|
||||||
|
|
Loading…
Reference in a new issue