52 lines
2.3 KiB
Diff
52 lines
2.3 KiB
Diff
From cddbe3b3b237b8e63abd8921fdb20314c20c2c08 Mon Sep 17 00:00:00 2001
|
|
From: Jasper Chan <jasperchan515@gmail.com>
|
|
Date: Sat, 22 Sep 2018 20:59:29 -0700
|
|
Subject: [PATCH] Switch to wx-config-gtk3 to avoid conflict with
|
|
wxWidgets-gtk2
|
|
|
|
---
|
|
build.py | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git build.py build.py
|
|
index 3cd5b828..57dbd384 100755
|
|
--- build.py
|
|
+++ build.py
|
|
@@ -400,7 +400,7 @@ def makeOptionParser():
|
|
("mac_arch", ("", "Comma separated list of architectures to build on Mac")),
|
|
|
|
("use_syswx", (False, "Try to use an installed wx rather than building the "
|
|
- "one in this source tree. The wx-config in {prefix}/bin "
|
|
+ "one in this source tree. The wx-config-gtk3 in {prefix}/bin "
|
|
"or the first found on the PATH determines which wx is "
|
|
"used. Implies --no_magic.")),
|
|
("force_config", (False, "Run configure when building even if the script "
|
|
@@ -1271,7 +1271,7 @@ def cmd_build_wx(options, args):
|
|
os.path.join(wxDir(), 'configure'),
|
|
os.path.join(wxDir(), 'setup.h.in'),
|
|
os.path.join(wxDir(), 'version-script.in'),
|
|
- os.path.join(wxDir(), 'wx-config.in'),
|
|
+ os.path.join(wxDir(), 'wx-config-gtk3.in'),
|
|
]
|
|
for dep in dependencies:
|
|
if newer(dep, os.path.join(BUILD_DIR, "Makefile")):
|
|
@@ -1424,13 +1424,13 @@ def cmd_build_py(options, args):
|
|
os.environ['WXPYTHON_RELEASE'] = 'yes'
|
|
|
|
if not isWindows:
|
|
- WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config')
|
|
+ WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3')
|
|
if options.use_syswx:
|
|
- wxcfg = posixjoin(options.prefix, 'bin', 'wx-config')
|
|
+ wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3')
|
|
if options.prefix and os.path.exists(wxcfg):
|
|
WX_CONFIG = wxcfg
|
|
else:
|
|
- WX_CONFIG = 'wx-config' # hope it is on the PATH
|
|
+ WX_CONFIG = 'wx-config-gtk3' # hope it is on the PATH
|
|
|
|
|
|
wafBuildBase = wafBuildDir = getWafBuildBase()
|
|
--
|
|
2.19.0
|
|
|