From ddb6b1f242031dc55e52403029ac851cc70bd1f8 Mon Sep 17 00:00:00 2001
From: Matthias Kramm <kramm@quiss.org>
Date: Tue, 25 May 2010 19:24:45 -0700
Subject: [PATCH] applied swfcombine finding patch from Ricardo Pedroso
---
wx/gui/plugin.py | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/wx/gui/plugin.py b/wx/gui/plugin.py
index f58cc50..e20a87c 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([
--
1.7.10.4