diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index cbff692b1..08d00b65b 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -137,10 +137,6 @@ PUBLIC_HEADERS = retroshare/rsblogs.h \ HEADERS += $$PUBLIC_HEADERS -DEFINES *= UBUNTU -INCLUDEPATH += /usr/include/glib-2.0/ /usr/lib/glib-2.0/include -LIBS *= -lgnome-keyring - # public headers to be... HEADERS += retroshare/rsgame.h \ retroshare/rsphoto.h @@ -185,6 +181,10 @@ linux-* { INSTALLS += include_rsiface #CONFIG += version_detail_bash_script + + DEFINES *= UBUNTU + INCLUDEPATH += /usr/include/glib-2.0/ /usr/lib/glib-2.0/include + LIBS *= -lgnome-keyring } linux-g++ { diff --git a/libretroshare/src/util/rsrandom.cc b/libretroshare/src/util/rsrandom.cc index c1d346be9..061429888 100644 --- a/libretroshare/src/util/rsrandom.cc +++ b/libretroshare/src/util/rsrandom.cc @@ -7,8 +7,9 @@ uint32_t RSRandom::index = 0 ; std::vector RSRandom::MT(RSRandom::N,0u) ; RsMutex RSRandom::rndMtx ; -// If this does not compile on windows, use a ifdef to keep this on linux plz. +#ifdef UBUNTU static bool auto_seed = RSRandom::seed( (time(NULL) + pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ; +#endif bool RSRandom::seed(uint32_t s) {