summaryrefslogtreecommitdiff
path: root/wx
diff options
context:
space:
mode:
authorMatthias Kramm <kramm@quiss.org>2010-05-25 19:24:45 -0700
committerMatthias Kramm <kramm@quiss.org>2010-05-25 19:24:45 -0700
commitddb6b1f242031dc55e52403029ac851cc70bd1f8 (patch)
tree15528cb019ae92e3aba058758ee6f40596208c36 /wx
parent8fb53b51553f27cc666dc491f3e24ce1b39c9437 (diff)
applied swfcombine finding patch from Ricardo Pedroso
Diffstat (limited to 'wx')
-rw-r--r--wx/gui/plugin.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/wx/gui/plugin.py b/wx/gui/plugin.py
index f58cc50f..e20a87c2 100644
--- a/wx/gui/plugin.py
+++ b/wx/gui/plugin.py
@@ -57,9 +57,19 @@ class Plugin:
opj = os.path.join
locations = [os.path.normpath(opj(basedir, '..', prog))]
if "wxMSW" in wx.PlatformInfo:
+ try:
+ system_drive = os.environ['SYSTEMDRIVE']
+ except KeyError:
+ system_drive = 'c:'
+ try:
+ program_files = os.environ['PROGRAMFILES']
+ except KeyError:
+ program_files = ''
locations.extend([
- opj("c:", "swftools", prog),
- opj("c:", "Program Files", "SWFTools", prog)
+ opj("c:", os.sep, "swftools", prog),
+ opj("c:", os.sep, "Program Files", "SWFTools", prog),
+ opj(system_drive, os.sep, program_files, "SWFTools", prog),
+ opj(basedir, prog),
])
else:
locations.extend([