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

Change the unix to linux-* qtcreator files

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1789 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-10-30 01:41:16 +00:00
parent e6fd8be204
commit 6e225dec47
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libretroshare/src/libretroshare.pro
View File

@ -10,8 +10,6 @@ profiling {
QMAKE_CXXFLAGS *= -pg -g -fno-omit-frame-pointer QMAKE_CXXFLAGS *= -pg -g -fno-omit-frame-pointer
} }
################################# Linux ##########################################
debug { debug {
# DEFINES *= DEBUG # DEFINES *= DEBUG
# DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_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 QMAKE_CXXFLAGS *= -g
} }
unix { ################################# Linux ##########################################
linux-* {
DESTDIR = lib DESTDIR = lib
QMAKE_CXXFLAGS *= -Wall QMAKE_CXXFLAGS *= -Wall
QMAKE_CC = g++ QMAKE_CC = g++

3
retroshare-gui/src/RetroShare.pro
View File

@ -11,7 +11,7 @@ MOC_DIR = temp/moc
################################# Linux ########################################## ################################# Linux ##########################################
# Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib # Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
unix { linux-* {
CONFIG += version_detail_bash_script CONFIG += version_detail_bash_script
LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += -lssl -lcrypto -lgpgme -lpthread -lz -lupnp LIBS += -lssl -lcrypto -lgpgme -lpthread -lz -lupnp
@ -31,6 +31,7 @@ version_detail_bash_script {
PRE_TARGETDEPS = write_version_detail PRE_TARGETDEPS = write_version_detail
write_version_detail.commands = ./version_detail.sh write_version_detail.commands = ./version_detail.sh
} }
#################### Cross compilation for windows under Linux ################### #################### Cross compilation for windows under Linux ###################
win32-x-g++ { win32-x-g++ {