From b42e0c160fe8fe534385d5eedf2efab92661464c Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 24 Jul 2021 16:39:23 -0700 Subject: [PATCH] The setup0.h hack is no longer needed --- buildtools/build_wxwidgets.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/buildtools/build_wxwidgets.py b/buildtools/build_wxwidgets.py index 84cb5108..97d55afc 100644 --- a/buildtools/build_wxwidgets.py +++ b/buildtools/build_wxwidgets.py @@ -381,7 +381,7 @@ def main(wxDir, args): flags = {} buildDir = os.path.abspath(os.path.join(wxRootDir, "build", "msw")) - print("creating wx/msw/setup.h from setup0.h") + print("Updating wx/msw/setup.h") if options.unicode: flags["wxUSE_UNICODE"] = "1" if VERSION < (2,9): @@ -411,8 +411,8 @@ def main(wxDir, args): mswIncludeDir = os.path.join(wxRootDir, "include", "wx", "msw") - setup0File = os.path.join(mswIncludeDir, "setup0.h") - with open(setup0File, "rb") as f: + setupFile = os.path.join(mswIncludeDir, "setup.h") + with open(setupFile, "rb") as f: setupText = f.read() if PY3: setupText = setupText.decode('utf-8') @@ -420,10 +420,10 @@ def main(wxDir, args): for flag in flags: setupText, subsMade = re.subn(flag + "\s+?\d", "%s %s" % (flag, flags[flag]), setupText) if subsMade == 0: - print("Flag %s wasn't found in setup0.h!" % flag) + print("Flag %s wasn't found in setup.h!" % flag) sys.exit(1) - with open(os.path.join(mswIncludeDir, "setup.h"), "wb") as f: + with open(setupFile, "wb") as f: if PY3: setupText = setupText.encode('utf-8') f.write(setupText)