Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 20:10:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean it up

Browse Source
This commit is contained in:
Robin Dunn
2021-12-17 15:00:24 -08:00
parent 5f3c8cd22b
commit 454ef9b2cd
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
buildtools/build_wxwidgets.py
View File

@@ -309,7 +309,11 @@ def main(wxDir, args):
for major, minor in reversed(possibles): for major, minor in reversed(possibles):
sdk = os.path.join(xcodePath, "SDKs/MacOSX{}.{}.sdk".format(major, minor)) sdk = os.path.join(xcodePath, "SDKs/MacOSX{}.{}.sdk".format(major, minor))
if os.path.exists(sdk): if os.path.exists(sdk):
#wxpy_configure_opts.append("--with-macosx-sdk=%s" % sdk) # Although we've found a SDK, we're not actually using
# it at the moment. The builds seem to work better if we
# let the compiler use whatever it considers to be the
# default.
# wxpy_configure_opts.append("--with-macosx-sdk=%s" % sdk)
universalCapable = major >= 11 universalCapable = major >= 11
SDK = sdk SDK = sdk
break break
@@ -328,7 +332,7 @@ def main(wxDir, args):
arch = options.mac_universal_binary arch = options.mac_universal_binary
configure_opts.append("--enable-universal_binary=%s" % arch) configure_opts.append("--enable-universal_binary=%s" % arch)
print("SDK Path: {}".format(SDK)) # print("SDK Path: {}".format(SDK))
print("Universal Capable: {}".format(universalCapable)) print("Universal Capable: {}".format(universalCapable))
print("Architectures: {}".format(arch)) print("Architectures: {}".format(arch))

2
wx/svg/_nanosvg.c
View File

@@ -21780,7 +21780,7 @@ static int __Pyx_check_binary_version(void) {
if (ctversion[0] != rtversion[0] || ctversion[2] != rtversion[2]) { if (ctversion[0] != rtversion[0] || ctversion[2] != rtversion[2]) {
char message[200]; char message[200];
PyOS_snprintf(message, sizeof(message), PyOS_snprintf(message, sizeof(message),
"compile time version %s of module '%.100s' " "compiletime version %s of module '%.100s' "
"does not match runtime version %s", "does not match runtime version %s",
ctversion, __Pyx_MODULE_NAME, rtversion); ctversion, __Pyx_MODULE_NAME, rtversion);
return PyErr_WarnEx(NULL, message, 1); return PyErr_WarnEx(NULL, message, 1);