mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Use StandardPaths::SetInstallPrefix to set the prefix using INSTALL_PREFIX

Browse source 
which is taken from configure (either default or with --prefix).  This is the
beginings of proper relocation support on UNIX. (thanks jfs!)

Originally committed to SVN as r2606.
This commit is contained in:
Amar Takhar 2009-01-01 13:10:51 +00:00
parent d935c3fdd3
commit 5b17133fee
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
aegisub/standard_paths.cpp
View file

@ -52,14 +52,20 @@ StandardPaths *StandardPaths::GetInstance() {
/////////////// ///////////////
// Constructor // Constructor
StandardPaths::StandardPaths() { StandardPaths::StandardPaths() {
wxStandardPathsBase &paths = wxStandardPaths::Get();
#ifdef __UNIX__
// Relocation support, this is required to set the prefix to all
// wx StandardPaths.
static_cast<wxStandardPaths&>(paths).SetInstallPrefix(wxT(INSTALL_PREFIX));
#endif
// Get paths // Get paths
//wxFileName dataDir(wxStandardPaths::Get().GetDataDir()); wxString dataDir = paths.GetDataDir();
wxString dataDir = wxStandardPaths::Get().GetDataDir(); wxString userDir = paths.GetUserDataDir();
wxString userDir = wxStandardPaths::Get().GetUserDataDir(); wxString tempDir = paths.GetTempDir();
wxString tempDir = wxStandardPaths::Get().GetTempDir();
// Set paths // Set paths
//DoSetPathValue(_T("?data"),dataDir.GetPath(wxPATH_GET_VOLUME,wxPATH_NATIVE));
DoSetPathValue(_T("?data"),dataDir); DoSetPathValue(_T("?data"),dataDir);
DoSetPathValue(_T("?user"),userDir); DoSetPathValue(_T("?user"),userDir);
DoSetPathValue(_T("?temp"),tempDir); DoSetPathValue(_T("?temp"),tempDir);
@ -67,10 +73,6 @@ StandardPaths::StandardPaths() {
// Create paths if they don't exist // Create paths if they don't exist
wxFileName folder(userDir + _T("/")); wxFileName folder(userDir + _T("/"));
if (!folder.DirExists()) folder.Mkdir(0777,wxPATH_MKDIR_FULL); if (!folder.DirExists()) folder.Mkdir(0777,wxPATH_MKDIR_FULL);
//folder.Assign(dataDir + _T("/"));
//if (!folder.DirExists()) folder.Mkdir(0777,wxPATH_MKDIR_FULL);
//folder.Assign(tempDir + _T("/"));
//if (!folder.DirExists()) folder.Mkdir(0777,wxPATH_MKDIR_FULL);
} }