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

The setup0.h hack is no longer needed

Browse Source
This commit is contained in:
Robin Dunn
2021-07-24 16:39:23 -07:00
parent 7f5de39592
commit b42e0c160f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
buildtools/build_wxwidgets.py
View File

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