diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-06-28 02:57:42 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-06-28 02:57:42 +0300 |
| commit | 72c39aee65ed88c81343c80bd5cbfbf1f4611218 (patch) | |
| tree | d622458a039ff6644922d55c793bfd3d2c7676b9 /src | |
| parent | f902b4a3c13d1502bec17754f15fce03a21c5aaa (diff) | |
| download | mv-72c39aee65ed88c81343c80bd5cbfbf1f4611218.tar.gz mv-72c39aee65ed88c81343c80bd5cbfbf1f4611218.tar.bz2 mv-72c39aee65ed88c81343c80bd5cbfbf1f4611218.tar.xz mv-72c39aee65ed88c81343c80bd5cbfbf1f4611218.zip | |
More fixes for compilation under MacOS.
Add sample make script for fink.
Possible broke support for dmg images.
Diffstat (limited to 'src')
| -rw-r--r-- | src/client.cpp | 6 | ||||
| -rw-r--r-- | src/utils/gettext.h | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/client.cpp b/src/client.cpp index 25389f92a..7d8ae90b6 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -336,7 +336,11 @@ Client::Client(const Options &options): //possible crash strncat(path, "/data", PATH_MAX - 1); resman->addToSearchPath(path, false); - mPackageDir = path; +// possible this need for support run client from dmg images. +// mPackageDir = path; + + resman->addToSearchPath(PKG_DATADIR "data", false); + mPackageDir = PKG_DATADIR "data"; #else resman->addToSearchPath(PKG_DATADIR "data", false); mPackageDir = PKG_DATADIR "data"; diff --git a/src/utils/gettext.h b/src/utils/gettext.h index 0a15aa724..67d74aa19 100644 --- a/src/utils/gettext.h +++ b/src/utils/gettext.h @@ -39,15 +39,7 @@ #define gettext(s) (const_cast <char*>(s)) #define _(s) (const_cast <char*>(s)) #define N_(s) (const_cast <char*>(s)) - -char* ngettext(char* msgid, char* msgid_plural, unsigned long int n); - -char* ngettext(char* msgid, char* msgid_plural, unsigned long int n) -{ - if(n > 1) - return msgid_plural; - return msgid; -} +#define ngettext(s1,s2,i1) (const_cast <char*>(s1)) #endif |