Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 09:40:07 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Force use of builtin libs on macOS, rather than any that might be found on the system

Browse Source
This commit is contained in:
Robin Dunn
2021-12-03 08:42:17 -08:00
parent 4488663deb
commit b528e68ead
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.py
View File

@@ -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

9
buildtools/build_wxwidgets.py
View File

@@ -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: