diff options
| author | Anton <anton@picapica> | 2018-07-14 21:33:59 +0400 |
|---|---|---|
| committer | Anton <anton@picapica> | 2018-07-14 21:33:59 +0400 |
| commit | b664ebc47f353657b9e3ab8a73064515eed3f7a6 (patch) | |
| tree | c6c28a022035737bd9b6db460f2a4ce29a51b6d1 | |
| parent | 9087b81f88a91de808573e05f112e0d3c4b1dac6 (diff) | |
| download | pica-pica-b664ebc47f353657b9e3ab8a73064515eed3f7a6.tar.gz pica-pica-b664ebc47f353657b9e3ab8a73064515eed3f7a6.zip | |
preprocessor conditions for loading resources on OS X
| -rw-r--r-- | pica-client/globals.h | 1 | ||||
| -rw-r--r-- | pica-client/main.cpp | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/pica-client/globals.h b/pica-client/globals.h index 875bd83..c5befda 100644 --- a/pica-client/globals.h +++ b/pica-client/globals.h @@ -9,6 +9,7 @@ #ifndef PICA_INSTALLPREFIX #define PICA_INSTALLPREFIX "/usr" +#define PICA_APPBUNDLENAME "PicaPicaMessenger.app" #endif diff --git a/pica-client/main.cpp b/pica-client/main.cpp index 14c056e..ad9ffb2 100644 --- a/pica-client/main.cpp +++ b/pica-client/main.cpp @@ -40,6 +40,10 @@ QString config_defaultCA(PICA_INSTALLPREFIX"/share/pica-client/CA.pem"); QString config_defaultDHParam(PICA_INSTALLPREFIX"/share/pica-client/"PICA_CLIENT_DHPARAMFILE); QString snd_newmessage(PICA_INSTALLPREFIX"/share/pica-client/picapica-snd-newmessage.wav"); +#elif defined(__APPLE__) +QString config_defaultDHParam("./"PICA_APPBUNDLENAME"/Contents/Resources/"PICA_CLIENT_DHPARAMFILE); + +QString snd_newmessage("./"PICA_APPBUNDLENAME"/Contents/Resources/picapica-snd-newmessage.wav"); #else QString config_defaultCA("share\\CA.pem"); QString config_defaultDHParam("share\\"PICA_CLIENT_DHPARAMFILE); @@ -492,6 +496,9 @@ int main(int argc, char *argv[]) #ifndef WIN32 picapica_ico_sit = QIcon(PICA_INSTALLPREFIX"/share/pica-client/picapica-icon-sit.png"); picapica_ico_fly = QIcon(PICA_INSTALLPREFIX"/share/pica-client/picapica-icon-fly.png"); +#elif defined(__APPLE__) + picapica_ico_sit = QIcon("./"PICA_APPBUNDLENAME"/Contents/Resources/picapica-icon-sit.png"); + picapica_ico_fly = QIcon("./"PICA_APPBUNDLENAME"/Contents/Resources/picapica-icon-fly.png"); #else picapica_ico_sit = QIcon("share\\picapica-icon-sit.png"); picapica_ico_fly = QIcon("share\\picapica-icon-fly.png"); |