From b528e68ead978882cbe6d8c06575bb90eec29a0c Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 3 Dec 2021 08:42:17 -0800 Subject: [PATCH] Force use of builtin libs on macOS, rather than any that might be found on the system --- build.py | 2 +- buildtools/build_wxwidgets.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.py b/build.py index bc22610b..ab548d59 100755 --- a/build.py +++ b/build.py @@ -325,7 +325,7 @@ def setDevModeOptions(args): myDevModeOptions = [ #'--build_dir=../bld', #'--prefix=/opt/wx/2.9', - '--jobs={}'.format(max(2, numCPUs()/2)), + '--jobs={}'.format(max(2, int(numCPUs()/2))), # These will be ignored on the other platforms so it is okay to # include them unconditionally diff --git a/buildtools/build_wxwidgets.py b/buildtools/build_wxwidgets.py index 0839118f..57ad22ec 100644 --- a/buildtools/build_wxwidgets.py +++ b/buildtools/build_wxwidgets.py @@ -332,10 +332,11 @@ def main(wxDir, args): print("Universal Capable: {}".format(universalCapable)) print("Architectures: {}".format(arch)) - # Using 'builtin' has problems with universal builds, make sure to - # force use of system regex library in case configure would - # otherwise try to use builtin - # wxpy_configure_opts.append("--with-regex=sys") + wxpy_configure_opts.append("--with-libjpeg=builtin") + wxpy_configure_opts.append("--with-libpng=builtin") + wxpy_configure_opts.append("--with-libtiff=builtin") + wxpy_configure_opts.append("--with-regex=builtin") + if not options.mac_framework: if installDir and not prefixDir: