Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #374 from PhenomRetroShare/Fix_MacOSVersion

Browse Source 
Fix preprocessor for MacOS version.
This commit is contained in:
Cyril Soler 2016-05-08 10:42:20 -04:00
commit 4b81fb0a5a
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/dbase/findex.cc
View File

@ -33,7 +33,7 @@
#include <stdlib.h>
#include <algorithm>
#include <iostream>
#ifdef __MAC_10_10
#ifdef __MACH__
#include <unordered_set>
#else
#include <tr1/unordered_set>
@ -58,7 +58,7 @@ static const char FILE_CACHE_SEPARATOR_CHAR = '|' ;
****/
static RsMutex FIndexPtrMtx("FIndexPtrMtx") ;
#ifdef __MAC_10_10
#ifdef __MACH__
std::unordered_set<void*> FileIndex::_pointers ;
#else
std::tr1::unordered_set<void*> FileIndex::_pointers ;

4
libretroshare/src/dbase/findex.h
View File

@ -27,7 +27,7 @@
#include <string>
#include <map>
#include <set>
#if __MAC_10_10
#if __MACH__
#include <unordered_set>
#else
#include <tr1/unordered_set>
@ -250,7 +250,7 @@ class FileIndex
PersonEntry *root;
#ifdef __MAC_10_10
#ifdef __MACH__
static std::unordered_set<void*> _pointers ;
#else
static std::tr1::unordered_set<void*> _pointers ;

10
retroshare.pri
View File

@ -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
}