zdoom/zdoom-macos-deps
0
0
Fork 0
mirror of https://github.com/ZDoom/zdoom-macos-deps.git synced 2024-11-10 14:41:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

aedi: implement building with static moltenvk

Browse source 
this applies to gzdoom and raze targets only
This commit is contained in:
alexey.lysiuk 2022-08-22 10:49:48 +03:00
parent 21e032934d
commit efe513ec17
2 changed files with 52 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
aedi/state.py
View file

@ -55,6 +55,7 @@ class BuildState:
self.xcode = False self.xcode = False
self.verbose = False self.verbose = False
self.jobs = 1 self.jobs = 1
self.static_moltenvk = False
self.environment = os.environ.copy() self.environment = os.environ.copy()
self.options = CommandLineOptions() self.options = CommandLineOptions()

65
aedi/target/main.py
View file

@ -18,6 +18,7 @@
import os import os
import shutil import shutil
from pathlib import Path
from platform import machine from platform import machine
from ..state import BuildState from ..state import BuildState
@ -86,7 +87,7 @@ class ZDoomBaseTarget(CMakeMainTarget):
def configure(self, state: BuildState): def configure(self, state: BuildState):
opts = state.options opts = state.options
opts['CMAKE_EXE_LINKER_FLAGS'] = state.run_pkg_config('--libs', 'fluidsynth', 'libmpg123') opts['CMAKE_EXE_LINKER_FLAGS'] += state.run_pkg_config('--libs', 'fluidsynth', 'libmpg123')
opts['PK3_QUIET_ZIPDIR'] = 'YES' opts['PK3_QUIET_ZIPDIR'] = 'YES'
opts['DYN_OPENAL'] = 'NO' opts['DYN_OPENAL'] = 'NO'
@ -100,24 +101,60 @@ class ZDoomVulkanBaseTarget(ZDoomBaseTarget):
def __init__(self, name=None): def __init__(self, name=None):
super().__init__(name) super().__init__(name)
def configure(self, state: BuildState):
if state.static_moltenvk:
state.options['CMAKE_EXE_LINKER_FLAGS'] += '-framework Metal -framework IOSurface -lMoltenVK-static'
# Unset SDK because MoltenVK usually requires the latest one shipped with Xcode
state.platform.sdk_path = None
# Replace volk and update revision files
replacement_src_path = state.patch_path / 'static-moltenvk'
replacement_files = ('UpdateRevision.cmake', 'volk.c', 'volk.h')
replacement_dst_volk_subpath = 'common/rendering/vulkan/thirdparty/volk/'
replacement_dst_volk_path = Path('src') / replacement_dst_volk_subpath
if not os.path.exists(state.source / replacement_dst_volk_path):
replacement_dst_volk_path = Path('source') / replacement_dst_volk_subpath
replacement_dst_paths = (
'tools/updaterevision',
replacement_dst_volk_path,
replacement_dst_volk_path
)
for dst_path, filename in zip(replacement_dst_paths, replacement_files):
src = replacement_src_path / filename
dst = state.source / dst_path / filename
src_stat = os.stat(src)
dst_stat = os.stat(dst)
if src_stat.st_mtime != dst_stat.st_mtime:
shutil.copy2(src, dst)
super().configure(state)
def post_build(self, state: BuildState): def post_build(self, state: BuildState):
# Put MoltenVK library into application bundle if not state.static_moltenvk:
molten_lib = 'libMoltenVK.dylib' # Put MoltenVK library into application bundle
src_path = state.lib_path / molten_lib molten_lib = 'libMoltenVK.dylib'
dst_path = state.build_path src_path = state.lib_path / molten_lib
dst_path = state.build_path
if state.xcode: if state.xcode:
# TODO: Support other configurations # TODO: Support other configurations
dst_path /= 'Debug' dst_path /= 'Debug'
dst_path /= self.name + '.app/Contents/MacOS' dst_path /= self.name + '.app/Contents/MacOS'
os.makedirs(dst_path, exist_ok=True) os.makedirs(dst_path, exist_ok=True)
dst_path /= molten_lib dst_path /= molten_lib
if not dst_path.exists(): if not dst_path.exists():
copy_func = state.xcode and os.symlink or shutil.copy copy_func = state.xcode and os.symlink or shutil.copy
copy_func(src_path, dst_path) copy_func(src_path, dst_path)
super().post_build(state) super().post_build(state)