ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement relocatable builds on Linux 

- Change the path of the Sys folder to the executable's location
- Add LINUX_LOCAL_DEV flag to use relocatable version on Linux
- Add CMake definition for relocatable build
This commit is contained in:
Mathieu Comandon 2015-11-07 10:50:47 -08:00
parent 973118511a
commit f2ae1a2545
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -312,6 +312,12 @@ if(WIN32)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE) add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
endif(WIN32) endif(WIN32)
# Add an option to build relocatable binaries on Linux
# The Sys folder will need to be copied to the Binaries folder.
if(UNIX)
add_definitions(-DLINUX_LOCAL_DEV=0)
endif(UNIX)
# Dolphin requires threads. # Dolphin requires threads.
# The Apple build may not need an explicit flag because one of the # The Apple build may not need an explicit flag because one of the
# frameworks may already provide it. # frameworks may already provide it.

2
Source/Core/Common/CommonPaths.h
View File

@ -32,7 +32,7 @@
#endif #endif
// Shared data dirs (Sys and shared User for Linux) // Shared data dirs (Sys and shared User for Linux)
#ifdef _WIN32 #if defined(_WIN32) || defined(LINUX_LOCAL_DEV)
#define SYSDATA_DIR "Sys" #define SYSDATA_DIR "Sys"
#elif defined __APPLE__ #elif defined __APPLE__
#define SYSDATA_DIR "Contents/Resources/Sys" #define SYSDATA_DIR "Contents/Resources/Sys"

16
Source/Core/Common/FileUtil.cpp
View File

@ -728,12 +728,12 @@ std::string GetBundleDirectory()
} }
#endif #endif
#ifdef _WIN32
std::string& GetExeDirectory() std::string& GetExeDirectory()
{ {
static std::string DolphinPath; static std::string DolphinPath;
if (DolphinPath.empty()) if (DolphinPath.empty())
{ {
#ifdef _WIN32
TCHAR Dolphin_exe_Path[2048]; TCHAR Dolphin_exe_Path[2048];
TCHAR Dolphin_exe_Clean_Path[MAX_PATH]; TCHAR Dolphin_exe_Clean_Path[MAX_PATH];
GetModuleFileName(nullptr, Dolphin_exe_Path, 2048); GetModuleFileName(nullptr, Dolphin_exe_Path, 2048);
@ -742,10 +742,20 @@ std::string& GetExeDirectory()
else else
DolphinPath = TStrToUTF8(Dolphin_exe_Path); DolphinPath = TStrToUTF8(Dolphin_exe_Path);
DolphinPath = DolphinPath.substr(0, DolphinPath.find_last_of('\\')); DolphinPath = DolphinPath.substr(0, DolphinPath.find_last_of('\\'));
#else
char Dolphin_exe_Path[PATH_MAX];
ssize_t len = ::readlink("/proc/self/exe", Dolphin_exe_Path, sizeof(Dolphin_exe_Path));
if (len == -1 || len == sizeof(Dolphin_exe_Path))
{
len = 0;
}
Dolphin_exe_Path[len] = '\0';
DolphinPath = Dolphin_exe_Path;
DolphinPath = DolphinPath.substr(0, DolphinPath.rfind('/'));
#endif
} }
return DolphinPath; return DolphinPath;
} }
#endif
std::string GetSysDirectory() std::string GetSysDirectory()
{ {
@ -753,7 +763,7 @@ std::string GetSysDirectory()
#if defined (__APPLE__) #if defined (__APPLE__)
sysDir = GetBundleDirectory() + DIR_SEP + SYSDATA_DIR; sysDir = GetBundleDirectory() + DIR_SEP + SYSDATA_DIR;
#elif defined (_WIN32) #elif defined (_WIN32) || defined (LINUX_LOCAL_DEV)
sysDir = GetExeDirectory() + DIR_SEP + SYSDATA_DIR; sysDir = GetExeDirectory() + DIR_SEP + SYSDATA_DIR;
#else #else
sysDir = SYSDATA_DIR; sysDir = SYSDATA_DIR;

2
Source/Core/Common/FileUtil.h
View File

@ -145,9 +145,7 @@ std::string GetSysDirectory();
std::string GetBundleDirectory(); std::string GetBundleDirectory();
#endif #endif
#ifdef _WIN32
std::string &GetExeDirectory(); std::string &GetExeDirectory();
#endif
bool WriteStringToFile(const std::string& str, const std::string& filename); bool WriteStringToFile(const std::string& str, const std::string& filename);
bool ReadFileToString(const std::string& filename, std::string& str); bool ReadFileToString(const std::string& filename, std::string& str);