Fix libssh re-linking error (it ended up linked as @rpath/libssh.4.dylib)

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 7b03b0e87bca8b4d01af9c1f7626c6245f223391..32a10e30b0c5342e321129d308957a9301d598d2 100644 (file)
--- a/cscript
+++ b/cscript
@@ -431,7 +431,10 @@ def configure_options(target, options):
         opt += ' --static-dcpomatic'
 
     if can_build_disk(target):
-       opt += ' --enable-disk'
+        opt += ' --enable-disk'
+
+    if target.platform == 'osx' and target.arch == 'arm64':
+        opt += ' --target-macos-arm64 --wx-config=%s/wx-config' % target.bin
 
     return opt
 
@@ -685,11 +688,16 @@ def package(target, version, options):
                 return package_debian(target, cpu, version, options)
             elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia':
                 return package_rpm(target, cpu, version, options)
-    elif target.platform == 'osx' and target.bits is None:
-        target.command('bash platform/osx/make_dmg.sh %s %s universal no %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
-        return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
-    elif target.platform == 'osx' and target.bits == 64:
-        target.command('bash platform/osx/make_dmg.sh %s %s thin %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
+    elif target.platform == 'osx':
+        name = ''
+        if hasattr(target, 'archs') and sorted(target.archs) == sorted(('arm64', 'x86_64')):
+            name = 'arm-intel'
+        elif hasattr(target, 'arch'):
+            if target.arch == 'x86_64':
+                name = 'intel'
+            elif target.arch == 'arm64':
+                name = 'arm'
+        target.command('bash platform/osx/make_dmg.sh %s %s %s %s %s %s' % (target.environment_prefix, target.directory, name, target.sdk, target.apple_id, target.apple_password))
         packages = []
         for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'):
             a = os.path.abspath(x)