Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 16:09:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove some cruft from build files

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2018-06-11 14:21:28 +02:00
parent 6805875333
commit 1f76108a9e
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libretroshare/src/libretroshare.pro
View File

@ -267,8 +267,6 @@ win32-g++ {
DEFINES += USE_CMD_ARGS
CONFIG += upnp_miniupnpc
wLibs = ws2_32 gdi32 uuid iphlpapi crypt32 ole32 winmm
LIBS += $$linkDynamicLibs(wLibs)
}
@ -279,22 +277,10 @@ mac {
QMAKE_CC = $${QMAKE_CXX}
OBJECTS_DIR = temp/obj
MOC_DIR = temp/moc
#DEFINES = WINDOWS_SYS WIN32 STATICLIB MINGW
#DEFINES *= MINIUPNPC_VERSION=13
CONFIG += upnp_miniupnpc
CONFIG += c++11
# zeroconf disabled at the end of libretroshare.pro (but need the code)
#CONFIG += zeroconf
#CONFIG += zcnatassist
# Beautiful Hack to fix 64bit file access.
QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dfopen64=fopen -Dvstatfs64=vstatfs
#GPG_ERROR_DIR = ../../../../libgpg-error-1.7
#GPGME_DIR = ../../../../gpgme-1.1.8
for(lib, LIB_DIR):LIBS += -L"$$lib"
for(bin, BIN_DIR):LIBS += -L"$$bin"

4
retroshare-gui/src/gui/settings/rsharesettings.cpp
View File

@ -34,8 +34,8 @@
#include <retroshare/rsnotify.h>
#include <retroshare/rspeers.h>
#if defined(Q_OS_WIN)
#include <util/retroshareWin32.h>
#ifdef Q_OS_WIN
# include <util/retroshareWin32.h>
#endif
/* Retroshare's Settings */