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

Turn off using wx-dpi-aware.manifest for Python 2.7 builds

Browse Source
This commit is contained in:
Robin Dunn
2019-12-12 12:18:54 -08:00
parent 78e33dd817
commit 18b30fc2e6
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build.py
View File

@@ -1394,6 +1394,9 @@ def cmd_build_wx(options, args):
if options.jom: if options.jom:
build_options.append('--jom') build_options.append('--jom')
if version2 == '2.7':
build_options.append('--no_dpi_aware')
else: else:
# Platform is something other than MSW # Platform is something other than MSW
if options.osx_carbon: if options.osx_carbon:

5
buildtools/build_wxwidgets.py
View File

@@ -226,6 +226,7 @@ def main(wxDir, args):
"features" : ("", "A comma-separated list of wxUSE_XYZ defines on Win, or a list of configure flags on unix."), "features" : ("", "A comma-separated list of wxUSE_XYZ defines on Win, or a list of configure flags on unix."),
"verbose" : (False, "Print commands as they are run, (to aid with debugging this script)"), "verbose" : (False, "Print commands as they are run, (to aid with debugging this script)"),
"jom" : (False, "Use jom.exe instead of nmake for MSW builds."), "jom" : (False, "Use jom.exe instead of nmake for MSW builds."),
"no_dpi_aware" : (False, "Don't use the DPI_AWARE_MANIFEST."),
} }
parser = optparse.OptionParser(usage="usage: %prog [options]", version="%prog 1.0") parser = optparse.OptionParser(usage="usage: %prog [options]", version="%prog 1.0")
@@ -468,6 +469,10 @@ def main(wxDir, args):
if options.jom: if options.jom:
nmakeCommand = 'jom.exe' nmakeCommand = 'jom.exe'
if options.no_dpi_aware:
args.append("USE_DPI_AWARE_MANIFEST=0")
wxBuilder = builder.MSVCBuilder(commandName=nmakeCommand) wxBuilder = builder.MSVCBuilder(commandName=nmakeCommand)
if toolkit == "msvcProject": if toolkit == "msvcProject":