rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updating installed dir for Linux and MacOS #4696

This commit is contained in:
Adam Potolsky 2015-06-02 14:28:20 -07:00
parent d215c49966
commit 0061969cf2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/src/Plugin.cpp
View File

@ -35,11 +35,12 @@ static const char kInstallerPluginLocation[] = "Plugins";
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
static const char kMacPluginPrefix[] = "lib"; static const char kMacPluginPrefix[] = "lib";
static const char kMacPluginExt[] = ".dylib"; static const char kMacPluginExt[] = ".dylib";
static const char kInstallerPluginLocation[] = "plugins"; static const char kInstallerPluginLocation[] = "plugins"; // TODO: Fix for mac
#else #else
static const char kLinuxPluginPrefix[] = "lib"; static const char kLinuxPluginPrefix[] = "lib";
static const char kLinuxPluginExt[] = ".so"; static const char kLinuxPluginExt[] = ".so";
static const char kInstallerPluginLocation[] = "plugins"; // /usr/bin becomes /usr/bin/../lib/syn...
static const char kInstallerPluginLocation[] = "../lib/synergy/plugins";
#endif #endif
QString Plugin::getOsSpecificExt() QString Plugin::getOsSpecificExt()

4
src/lib/arch/unix/ArchFileUnix.cpp
View File

@ -92,9 +92,9 @@ std::string
ArchFileUnix::getInstalledDirectory() ArchFileUnix::getInstalledDirectory()
{ {
#if WINAPI_XWINDOWS #if WINAPI_XWINDOWS
return "/bin"; return "/usr/bin";
#else #else
return ""; return "/Applications/Synergy.app/Contents/MacOS/Synergy";
#endif #endif
} }