ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apple M1: More robust build for universal binaries 

- Fixed a typo in the Readme.md
- Made the recursiveMergeBinaries function handle divergent binary file trees
  better.
This commit is contained in:
Skyler Saleh 2021-04-17 15:50:41 -07:00
parent 4ff429266a
commit 0851693cbe
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BuildMacOSUniversalBinary.py
View File

@ -175,11 +175,14 @@ def recursiveMergeBinaries(src0, src1, dst):
# Loop over files in src1 and copy missing things over to dst # Loop over files in src1 and copy missing things over to dst
for newpath1 in glob.glob(src1+"/*"): for newpath1 in glob.glob(src1+"/*"):
filename = os.path.basename(newpath0) filename = os.path.basename(newpath1)
newpath0 = os.path.join(src0, filename) newpath0 = os.path.join(src0, filename)
new_dst_path = os.path.join(dst, filename) new_dst_path = os.path.join(dst, filename)
if not os.path.exists(newpath0) and not os.path.islink(newpath1): if (not os.path.exists(newpath0)) and (not os.path.islink(newpath1)):
if os.path.isdir(newpath1):
shutil.copytree(newpath1, new_dst_path) shutil.copytree(newpath1, new_dst_path)
else:
shutil.copy(newpath1, new_dst_path)
# Fix up symlinks for path0 # Fix up symlinks for path0
for newpath0 in glob.glob(src0+"/*"): for newpath0 in glob.glob(src0+"/*"):

2
Readme.md
View File

@ -69,7 +69,7 @@ application bundle using the following steps:
1. `mkdir build` 1. `mkdir build`
2. `cd build` 2. `cd build`
3. `python ../BuildMacOSUniveralBinary.py` 3. `python ../BuildMacOSUniversalBinary.py`
4. Universal binaries will be available in the `universal` folder 4. Universal binaries will be available in the `universal` folder
Doing this requires installation of library dependencies for both x64 and ARM (or universal library Doing this requires installation of library dependencies for both x64 and ARM (or universal library