diff --git a/build.py b/build.py index 98b95539..a451c495 100755 --- a/build.py +++ b/build.py @@ -1404,10 +1404,13 @@ def cmd_build_py(options, args): build_options.append('--jobs=%s' % options.jobs) if options.relwithdebug: build_options.append('--msvc_relwithdebug') - if options.gtk2: - build_options.append('--gtk2') - if options.gtk3: - build_options.append('--gtk3') + if not isDarwin and not isWindows: + if options.gtk2: + build_options.append('--gtk2') + wafBuildDir = posixjoin(wafBuildBase, 'gtk2') + if options.gtk3: + build_options.append('--gtk3') + wafBuildDir = posixjoin(wafBuildBase, 'gtk3') build_options.append('--python="%s"' % PYTHON) build_options.append('--out=%s' % wafBuildDir) # this needs to be the last option diff --git a/buildtools/config.py b/buildtools/config.py index 079a561f..c4acfc85 100644 --- a/buildtools/config.py +++ b/buildtools/config.py @@ -50,7 +50,7 @@ class Configuration(object): # wx-config command will be assembled based on version, port, # etc. and it will be looked for on the default $PATH. - WXPORT = 'gtk2' + WXPORT = 'gtk3' # On Linux/Unix there are several ports of wxWidgets available. # Setting this value lets you select which will be used for the # wxPython build. Possibilities are 'gtk', 'gtk2', 'gtk3' and 'x11'. @@ -351,6 +351,8 @@ class Configuration(object): def parseCmdLine(self): self.debug = '--debug' in sys.argv or '-g' in sys.argv + if '--gtk2' in sys.argv: + self.WXPORT = 'gtk2' if '--gtk3' in sys.argv: self.WXPORT = 'gtk3'