Fix wx-config on arm64.

3 files changed, 10 insertions, 1 deletions

diff --git a/cscript b/cscript
index 83d64e9cb..ac84c3717 100644
--- a/cscript
+++ b/cscript
@@ -434,7 +434,7 @@ def configure_options(target, options):
         opt += ' --enable-disk'
 
     if target.platform == 'osx' and target.arch == 'arm64':
-        opt += ' --target-macos-arm64'
+        opt += ' --target-macos-arm64 --wx-config=%s/bin' % target.target_environment
 
     return opt
 
diff --git a/src/wx/wscript b/src/wx/wscript
index 989135587..1c77e6305 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -172,6 +172,14 @@ def configure(conf):
 
     wx_libs = 'core,richtext,adv,html,xml,propgrid'
 
+    if conf.options.wx_config is not None:
+        conf.check_cfg(msg='Checking for wxWidgets using gtk2-unicode-3.0',
+                       package='',
+                       path=conf.options.wx_config,
+                       args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs,
+                       uselib_store='WXWIDGETS',
+                       mandatory=True)
+
     try:
         wx_config = '/usr/lib64/wx/config/gtk2-unicode-3.0'
         conf.check_cfg(msg='Checking for wxWidgets using gtk2-unicode-3.0',
diff --git a/wscript b/wscript
index 0fd7d88b2..171bfc935 100644
--- a/wscript
+++ b/wscript
@@ -76,6 +76,7 @@ def options(opt):
     opt.add_option('--use-lld',           action='store_true', default=False, help='use lld linker')
     opt.add_option('--enable-disk',       action='store_true', default=False, help='build dcpomatic2_disk tool; requires Boost process, lwext4 and nanomsg libraries')
     opt.add_option('--warnings-are-errors', action='store_true', default=False, help='build with -Werror')
+    opt.add_option('--wx-config',         help='path to wx-config')
 
 def configure(conf):
     conf.load('compiler_cxx')