mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2025-01-19 06:30:53 +00:00
aedi: build moltenvk as static library
dynamic library is created from the static one
This commit is contained in:
alexey.lysiuk
parent
308519a4ff
commit
10530a6663
3 changed files with 105 additions and 3 deletions
|
|
@ -285,7 +285,12 @@ class MoltenVKTarget(MakeTarget):
|
|||
def prepare_source(self, state: BuildState):
|
||||
state.download_source(
|
||||
'https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v1.1.11.tar.gz',
|
||||
'938ea0ba13c6538b0ee505ab391a3020f206ab9d29c869f20dd19318a4ee8997')
|
||||
'938ea0ba13c6538b0ee505ab391a3020f206ab9d29c869f20dd19318a4ee8997',
|
||||
patches='moltenvk-deployment-target')
|
||||
|
||||
def initialize(self, state: BuildState):
|
||||
super().initialize(state)
|
||||
self._make_dylib(state)
|
||||
|
||||
def detect(self, state: BuildState) -> bool:
|
||||
return state.has_source_file('MoltenVKPackaging.xcodeproj')
|
||||
|
|
@ -303,7 +308,7 @@ class MoltenVKTarget(MakeTarget):
|
|||
args = ['./fetchDependencies', '--macos']
|
||||
if state.verbose:
|
||||
args.append('-v')
|
||||
subprocess.check_call(args, cwd=state.build_path)
|
||||
subprocess.run(args, check=True, cwd=state.build_path, env=state.environment)
|
||||
|
||||
super().build(state)
|
||||
|
||||
|
|
@ -323,7 +328,43 @@ class MoltenVKTarget(MakeTarget):
|
|||
src_path = state.build_path / 'Package/Latest/MoltenVK'
|
||||
shutil.copytree(src_path / 'include/MoltenVK', include_path / 'MoltenVK')
|
||||
shutil.copy(state.build_path / 'LICENSE', state.install_path / 'apache2.txt')
|
||||
shutil.copy(src_path / 'dylib/macOS/libMoltenVK.dylib', lib_path)
|
||||
shutil.copy(
|
||||
src_path / 'MoltenVK.xcframework/macos-arm64_x86_64/libMoltenVK.a',
|
||||
lib_path / 'libMoltenVK-static.a')
|
||||
|
||||
self._make_dylib(state)
|
||||
|
||||
def _make_dylib(self, state: BuildState):
|
||||
lib_path = state.deps_path / self.name / 'lib'
|
||||
static_lib_path = lib_path / 'libMoltenVK-static.a'
|
||||
dynamic_lib_path = lib_path / 'libMoltenVK.dylib'
|
||||
|
||||
static_lib_time = os.stat(static_lib_path).st_mtime
|
||||
dynamic_lib_time = os.stat(dynamic_lib_path).st_mtime if os.path.exists(dynamic_lib_path) else 0
|
||||
|
||||
if static_lib_time != dynamic_lib_time:
|
||||
args = (
|
||||
'clang++',
|
||||
'-stdlib=libc++',
|
||||
'-dynamiclib',
|
||||
'-arch', 'arm64',
|
||||
'-arch', 'x86_64',
|
||||
'-mmacosx-version-min=10.12',
|
||||
'-compatibility_version', '1.0.0',
|
||||
'-current_version', '1.0.0',
|
||||
'-install_name', '@rpath/libMoltenVK.dylib',
|
||||
'-framework', 'Metal',
|
||||
'-framework', 'IOSurface',
|
||||
'-framework', 'AppKit',
|
||||
'-framework', 'QuartzCore',
|
||||
'-framework', 'CoreGraphics',
|
||||
'-framework', 'IOKit',
|
||||
'-framework', 'Foundation',
|
||||
'-o', dynamic_lib_path,
|
||||
'-force_load', static_lib_path
|
||||
)
|
||||
subprocess.run(args, check=True, env=state.environment)
|
||||
os.utime(dynamic_lib_path, (static_lib_time, static_lib_time))
|
||||
|
||||
|
||||
class Mpg123Target(CMakeStaticDependencyTarget):
|
||||
|
|
|
|||
1
deps/.gitignore
vendored
1
deps/.gitignore
vendored
|
|
@ -27,6 +27,7 @@
|
|||
/iconv/lib/libcharset.a
|
||||
/jpeg-turbo/bin/
|
||||
/jpeg-turbo/lib/pkgconfig/libturbojpeg.pc
|
||||
/moltenvk/lib/libMoltenVK.dylib
|
||||
/mpg123/lib/pkgconfig/libsyn123.pc
|
||||
/opusfile/lib/libopusurl.a
|
||||
/opusfile/lib/pkgconfig/opusurl.pc
|
||||
|
|
|
|||
60
patch/moltenvk-deployment-target.diff
Normal file
60
patch/moltenvk-deployment-target.diff
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
--- a/ExternalDependencies.xcodeproj/project.pbxproj
|
||||
+++ b/ExternalDependencies.xcodeproj/project.pbxproj
|
||||
@@ -5690,7 +5690,7 @@
|
||||
GCC_WARN_UNUSED_VARIABLE = NO;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
|
||||
MACH_O_TYPE = staticlib;
|
||||
- MACOSX_DEPLOYMENT_TARGET = 10.13;
|
||||
+ MACOSX_DEPLOYMENT_TARGET = 10.12;
|
||||
SKIP_INSTALL = YES;
|
||||
TVOS_DEPLOYMENT_TARGET = 11.0;
|
||||
};
|
||||
@@ -5740,7 +5740,7 @@
|
||||
GCC_WARN_UNUSED_VARIABLE = NO;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
|
||||
MACH_O_TYPE = staticlib;
|
||||
- MACOSX_DEPLOYMENT_TARGET = 10.13;
|
||||
+ MACOSX_DEPLOYMENT_TARGET = 10.12;
|
||||
SKIP_INSTALL = YES;
|
||||
TVOS_DEPLOYMENT_TARGET = 11.0;
|
||||
VALIDATE_PRODUCT = YES;
|
||||
--- a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
|
||||
+++ b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
|
||||
@@ -1619,7 +1619,7 @@
|
||||
);
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
|
||||
MACH_O_TYPE = staticlib;
|
||||
- MACOSX_DEPLOYMENT_TARGET = 10.13;
|
||||
+ MACOSX_DEPLOYMENT_TARGET = 10.12;
|
||||
MTL_ENABLE_DEBUG_INFO = YES;
|
||||
MVK_HIDE_VULKAN_SYMBOLS = 0;
|
||||
MVK_SKIP_DYLIB = "";
|
||||
@@ -1692,7 +1692,7 @@
|
||||
);
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
|
||||
MACH_O_TYPE = staticlib;
|
||||
- MACOSX_DEPLOYMENT_TARGET = 10.13;
|
||||
+ MACOSX_DEPLOYMENT_TARGET = 10.12;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
MVK_HIDE_VULKAN_SYMBOLS = 0;
|
||||
MVK_SKIP_DYLIB = "";
|
||||
--- a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
|
||||
+++ b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
|
||||
@@ -638,7 +638,7 @@
|
||||
);
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
|
||||
MACH_O_TYPE = staticlib;
|
||||
- MACOSX_DEPLOYMENT_TARGET = 10.13;
|
||||
+ MACOSX_DEPLOYMENT_TARGET = 10.12;
|
||||
PRODUCT_NAME = MoltenVKShaderConverter;
|
||||
SKIP_INSTALL = YES;
|
||||
TVOS_DEPLOYMENT_TARGET = 11.0;
|
||||
@@ -698,7 +698,7 @@
|
||||
);
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
|
||||
MACH_O_TYPE = staticlib;
|
||||
- MACOSX_DEPLOYMENT_TARGET = 10.13;
|
||||
+ MACOSX_DEPLOYMENT_TARGET = 10.12;
|
||||
PRODUCT_NAME = MoltenVKShaderConverter;
|
||||
SKIP_INSTALL = YES;
|
||||
TVOS_DEPLOYMENT_TARGET = 11.0;
|
||||
Loading…
Reference in a new issue