From 6e225dec475e1c7bfe6234c8f884825b29e3ea42 Mon Sep 17 00:00:00 2001 From: joss17 Date: Fri, 30 Oct 2009 01:41:16 +0000 Subject: [PATCH] Change the unix to linux-* qtcreator files git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1789 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/libretroshare.pro | 5 ++--- retroshare-gui/src/RetroShare.pro | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 1330b0863..60d5b4f99 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -10,8 +10,6 @@ profiling { QMAKE_CXXFLAGS *= -pg -g -fno-omit-frame-pointer } -################################# Linux ########################################## - debug { # DEFINES *= DEBUG # DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_DEBUG @@ -21,7 +19,8 @@ debug { QMAKE_CXXFLAGS *= -g } -unix { +################################# Linux ########################################## +linux-* { DESTDIR = lib QMAKE_CXXFLAGS *= -Wall QMAKE_CC = g++ diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index 1adfb6697..e6f21a6d4 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -11,7 +11,7 @@ MOC_DIR = temp/moc ################################# Linux ########################################## # Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib -unix { +linux-* { CONFIG += version_detail_bash_script LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += -lssl -lcrypto -lgpgme -lpthread -lz -lupnp @@ -31,6 +31,7 @@ version_detail_bash_script { PRE_TARGETDEPS = write_version_detail write_version_detail.commands = ./version_detail.sh } + #################### Cross compilation for windows under Linux ################### win32-x-g++ {