mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-11 13:17:00 -04:00
Updates to make things work.
Some trivial things that are required to make it work on Linux. Also updated build scripts to use Boost. You have to use ./configure --with-boost-regex=<libname, suitable for -l> git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1206 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -31,6 +31,10 @@ PackageManager package_manager;
|
||||
void PackageManager::init() {
|
||||
local.init(true);
|
||||
global.init(false);
|
||||
if (!(local.valid() || global.valid()))
|
||||
throw Error(_("The MSE data files can not be found, there should be a directory called 'data' with these files. ")
|
||||
_("The expected place to find it in was either ") + wxStandardPaths::Get().GetDataDir() + _(" or ") +
|
||||
wxStandardPaths::Get().GetUserDataDir());
|
||||
}
|
||||
void PackageManager::destroy() {
|
||||
loaded_packages.clear();
|
||||
@@ -186,15 +190,19 @@ void PackageDirectory::init(bool local) {
|
||||
String d = dir;
|
||||
dir = wxPathOnly(dir);
|
||||
if (d == dir) {
|
||||
// we are at the root -> 'data' not found anywhere in the path -> fatal error
|
||||
throw Error(_("The global MSE data files can not be found, there should be a directory called 'data' with these files. The expected place to find it in was ") + wxStandardPaths::Get().GetDataDir());
|
||||
// we are at the root -> 'data' not found anywhere in the path
|
||||
dir = wxStandardPaths::Get().GetDataDir();
|
||||
break;
|
||||
}
|
||||
}
|
||||
init(dir + _("/data"));
|
||||
}
|
||||
}
|
||||
void PackageDirectory::init(const String& dir) {
|
||||
directory = dir;
|
||||
if (wxDirExists(dir))
|
||||
directory = dir;
|
||||
else
|
||||
directory.clear();
|
||||
}
|
||||
|
||||
String PackageDirectory::name(const String& name) const {
|
||||
|
||||
@@ -63,6 +63,8 @@ class PackageDirectory {
|
||||
void init(bool local);
|
||||
void init(const String& dir);
|
||||
|
||||
bool valid() const { return !directory.empty(); }
|
||||
|
||||
/// Name of a package in this directory
|
||||
String name(const String& name) const;
|
||||
/// Does a package with the given name exist?
|
||||
|
||||
Reference in New Issue
Block a user