Fixed compilation on Visual C++.
git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@1351 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
parent
35523c6cf4
commit
a537d60571
11 changed files with 63 additions and 33 deletions
|
@ -29,6 +29,10 @@
|
|||
#include <glibmm/fileutils.h>
|
||||
#include <glibmm/pattern.h>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#include <glibmm/miscutils.h>
|
||||
#endif
|
||||
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
#include <functional>
|
||||
|
@ -71,11 +75,24 @@ PythonCPUPolicyManager::PythonCPUPolicyManager()
|
|||
|
||||
GlobalPreferences& prefs = GlobalPreferences::get_instance();
|
||||
|
||||
#ifdef _MSC_VER
|
||||
// Ensure relocation is possible on WIN32, relative paths don't appear
|
||||
// to work anymore
|
||||
Glib::ustring wdir = Glib::get_current_dir();
|
||||
#endif
|
||||
|
||||
Glib::ustring importdirs = "import sys; sys.path[:0] = [ ";
|
||||
for_each(prefs.get_policy_dirs().begin(),
|
||||
prefs.get_policy_dirs().end(),
|
||||
pol_dirs_concat(importdirs));
|
||||
|
||||
#ifdef _MSC_VER
|
||||
// Ensure relocation is possible on WIN32, relative paths don't appear
|
||||
// to work anymore
|
||||
importdirs += Glib::ustring(" '") + wdir + SHAREDIR + "' ]\n";
|
||||
#else
|
||||
importdirs += " '" SHAREDIR "' ]\n";
|
||||
#endif
|
||||
|
||||
PyRun_SimpleString(importdirs.c_str());
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue