From ceb092c71f3ec27e3269627fad01ba68837fcb02 Mon Sep 17 00:00:00 2001 From: Phenom Date: Fri, 6 May 2016 22:51:25 +0200 Subject: [PATCH] Fix preprocessor for MacOS version. --- libretroshare/src/dbase/findex.cc | 4 ++-- libretroshare/src/dbase/findex.h | 4 ++-- retroshare.pri | 10 ++++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libretroshare/src/dbase/findex.cc b/libretroshare/src/dbase/findex.cc index 9e211a821..7c4ea07b3 100644 --- a/libretroshare/src/dbase/findex.cc +++ b/libretroshare/src/dbase/findex.cc @@ -33,7 +33,7 @@ #include #include #include -#ifdef __MAC_10_10 +#ifdef __MACH__ #include #else #include @@ -58,7 +58,7 @@ static const char FILE_CACHE_SEPARATOR_CHAR = '|' ; ****/ static RsMutex FIndexPtrMtx("FIndexPtrMtx") ; -#ifdef __MAC_10_10 +#ifdef __MACH__ std::unordered_set FileIndex::_pointers ; #else std::tr1::unordered_set FileIndex::_pointers ; diff --git a/libretroshare/src/dbase/findex.h b/libretroshare/src/dbase/findex.h index a86915f95..87ad257d9 100644 --- a/libretroshare/src/dbase/findex.h +++ b/libretroshare/src/dbase/findex.h @@ -27,7 +27,7 @@ #include #include #include -#if __MAC_10_10 +#if __MACH__ #include #else #include @@ -250,7 +250,7 @@ class FileIndex PersonEntry *root; -#ifdef __MAC_10_10 +#ifdef __MACH__ static std::unordered_set _pointers ; #else static std::tr1::unordered_set _pointers ; diff --git a/retroshare.pri b/retroshare.pri index e36eaa152..bdedd670a 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -43,8 +43,14 @@ macx { INC_DIR += "/opt/local/include" LIB_DIR += "/usr/local/lib" LIB_DIR += "/opt/local/lib" - QMAKE_MACOSX_DEPLOYMENT_TARGET=10.10 - QMAKE_MAC_SDK = macosx10.10 + !QMAKE_MACOSX_DEPLOYMENT_TARGET { + message(***retroshare.pri: No Target, set it to MacOS 10.10 ) + QMAKE_MACOSX_DEPLOYMENT_TARGET=10.10 + } + !QMAKE_MAC_SDK { + message(***retroshare.pri: No SDK, set it to MacOS 10.10 ) + QMAKE_MAC_SDK = macosx10.10 + } CONFIG += c+11 }