updated to new lib location/name

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.4.x@1643 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-09-13 08:08:25 +00:00
parent 9d8ae50df7
commit 8658ceda8d
3 changed files with 101 additions and 100 deletions

View File

@ -1,15 +1,15 @@
TEMPLATE = lib
CONFIG += static
TARGET = retroshare
CONFIG += release
CONFIG += debug
################################# Linux ##########################################
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 *= P3TURTLE_DEBUG CHAT_DEBUG
DEFINES *= CHAT_DEBUG
# DEFINES *= DEBUG_PQISSL
QMAKE_CXXFLAGS *= -g
}
@ -30,7 +30,7 @@ linux-g++-64 {
win32-x-g++ {
OBJECTS_DIR = temp/win32xgcc/obj
DESTDIR = lib.win32xgcc
DEFINES *= WINDOWS_SYS WIN32
DEFINES *= WINDOWS_SYS WIN32 WIN_CROSS_UBUNTU __USE_LARGEFILE64
QMAKE_CXXFLAGS *= -Wmissing-include-dirs
QMAKE_CC = i586-mingw32msvc-g++
QMAKE_LIB = i586-mingw32msvc-ar
@ -48,7 +48,7 @@ win32 {
DESTDIR = lib
SSL_DIR = ../../../../openssl-0.9.7g-xpgp-0.1c/include
UPNPC_DIR = ../../../../miniupnpc-1.0
UPNPC_DIR = ../../../../miniupnpc-1.3
PTHREADS_DIR = ../../../../pthreads-w32-2-8-0-release
ZLIB_DIR = ../../../../zlib-1.2.3
@ -56,7 +56,7 @@ win32 {
}
################################### COMMON stuff ##################################
DEFINES *= PQI_USE_XPGP MINIUPNPC_VERSION=10
DEFINES *= PQI_USE_XPGP MINIUPNPC_VERSION=13
SSL_DIR=../../../openssl-0.9.7g-xpgp-0.1c
UPNPC_DIR=../../../miniupnpc-1.0

View File

@ -10,24 +10,25 @@ MOC_DIR = temp/moc
################################# Linux ##########################################
DEFINES *= _GNU_SOURCE
linux-g++ {
OBJECTS_DIR = temp/linux-g++/obj
LIBS += ../../libretroshare/src/lib.linux-g++/libretroshare.a
LIBS += ../../../lib/linux-g++/libminiupnpc.a
LIBS += ../../../lib/linux-g++/libssl.a
LIBS += ../../../lib/linux-g++/libcrypto.a
LIBS += -lQtUiTools
LIBS += -lz
LIBS += ../../../../build/lib.linux-g++/libminiupnpc.a
LIBS += ../../../../build/lib.linux-g++/libssl_xpgp.a
LIBS += ../../../../build/lib.linux-g++/libcrypto_xpgp.a
LIBS += -lz
}
linux-g++-64 {
OBJECTS_DIR = temp/linux-g++-64/obj
LIBS += ../../libretroshare/src/lib.linux-g++-64/libretroshare.a
LIBS += ../../../../build/lib.linux-g++-64/libminiupnpc.a
LIBS += ../../../../build/lib.linux-g++-64/libssl.a
LIBS += ../../../../build/lib.linux-g++-64/libcrypto.a
LIBS += -lz
LIBS += ../../../../build/lib.linux-g++-64/libssl_xpgp.a
LIBS += ../../../../build/lib.linux-g++-64/libcrypto_xpgp.a
LIBS += -lz
}
#################### Cross compilation for windows under Linux ###################
@ -35,11 +36,11 @@ linux-g++-64 {
win32-x-g++ {
OBJECTS_DIR = temp/win32-x-g++/obj
LIBS += ../../../../lib/win32-x-g++/libretroshare.a
LIBS += ../../../../lib/win32-x-g++/libssl.a
LIBS += ../../../../lib/win32-x-g++/libcrypto.a
LIBS += ../../../../lib/win32-x-g++/libminiupnpc.a
LIBS += ../../../../lib/win32-x-g++/libz.a
LIBS += ../../libretroshare/src/lib.win32xgcc/libretroshare.a
LIBS += ../../../../build/lib.win32-x-g++/libssl_xpgp.a
LIBS += ../../../../build/lib.win32-x-g++/libcrypto_xpgp.a
LIBS += ../../../../build/lib.win32-x-g++/libminiupnpc.a
LIBS += ../../../../build/lib.win32-x-g++/libz.a
LIBS += -L${HOME}/.wine/drive_c/pthreads/lib -lpthreadGCE2
LIBS += -lQtUiTools
LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32 -gdi32

View File

@ -1,82 +1,82 @@
TEMPLATE = app
TARGET = retroshare-nogui
################################# Linux ##########################################
linux-g++ {
OBJECTS_DIR = temp/linux-g++/obj
LIBS += ../../../lib/linux-g++/libretroshare.a
LIBS += ../../../lib/linux-g++/libminiupnpc.a
LIBS += ../../../lib/linux-g++/libssl.a
LIBS += ../../../lib/linux-g++/libcrypto.a
LIBS += -lz
}
linux-g++-64 {
OBJECTS_DIR = temp/linux-g++-64/obj
LIBS += ../../libretroshare/src/lib.linux-g++-64/libretroshare.a
LIBS += ../../../../build/lib.linux-g++-64/libminiupnpc.a
LIBS += ../../../../build/lib.linux-g++-64/libssl.a
LIBS += ../../../../build/lib.linux-g++-64/libcrypto.a
LIBS += -lz
}
#################### Cross compilation for windows under Linux ###################
win32-x-g++ {
OBJECTS_DIR = temp/win32-x-g++/obj
LIBS += ../../../../lib/win32-x-g++/libretroshare.a
LIBS += ../../../../lib/win32-x-g++/libssl.a
LIBS += ../../../../lib/win32-x-g++/libcrypto.a
LIBS += ../../../../lib/win32-x-g++/libminiupnpc.a
LIBS += ../../../../lib/win32-x-g++/libz.a
LIBS += -L${HOME}/.wine/drive_c/pthreads/lib -lpthreadGCE2
LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32 -gdi32
LIBS += -lole32 -lwinmm
RC_FILE = gui/images/retroshare_win.rc
DEFINES *= WIN32
}
#################################### Windows #####################################
win32 {
OBJECTS_DIR = temp/obj
RCC_DIR = temp/qrc
UI_DIR = temp/ui
MOC_DIR = temp/moc
LIBS += -L"../../../../lib" -lretroshare -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz
LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32-cygwin -gdi32
LIBS += -lole32 -lwinmm
}
##################################### MacOS ######################################
macx {
# ENABLE THIS OPTION FOR Univeral Binary BUILD.
# CONFIG += ppc x86
LIBS += -Wl,-search_paths_first
}
############################## Common stuff ######################################
DEPENDPATH += ../../libretroshare/src
TEMPLATE = app
TARGET = retroshare-nogui
################################# Linux ##########################################
linux-g++ {
OBJECTS_DIR = temp/linux-g++/obj
LIBS += ../../libretroshare/src/lib.linux-g++/libretroshare.a
LIBS += ../../../../build/lib.linux-g++/libminiupnpc.a
LIBS += ../../../../build/lib.linux-g++/libssl_xpgp.a
LIBS += ../../../../build/lib.linux-g++/libcrypto_xpgp.a
LIBS += -lz -lpthread
}
linux-g++-64 {
OBJECTS_DIR = temp/linux-g++-64/obj
LIBS += ../../libretroshare/src/lib.linux-g++-64/libretroshare.a
LIBS += ../../../../build/lib.linux-g++-64/libminiupnpc.a
LIBS += ../../../../build/lib.linux-g++-64/libssl_xpgp.a
LIBS += ../../../../build/lib.linux-g++-64/libcrypto_xpgp.a
LIBS += -lz
}
#################### Cross compilation for windows under Linux ###################
win32-x-g++ {
OBJECTS_DIR = temp/win32-x-g++/obj
LIBS += ../../libretroshare/src/lib.win32xgcc/libretroshare.a
LIBS += ../../../../lib/win32-x-g++/libssl_xpgp.a
LIBS += ../../../../lib/win32-x-g++/libcrypto_xpgp.a
LIBS += ../../../../lib/win32-x-g++/libminiupnpc.a
LIBS += ../../../../lib/win32-x-g++/libz.a
LIBS += -L${HOME}/.wine/drive_c/pthreads/lib -lpthreadGCE2
LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32 -gdi32
LIBS += -lole32 -lwinmm
RC_FILE = gui/images/retroshare_win.rc
DEFINES *= WIN32
}
#################################### Windows #####################################
win32 {
OBJECTS_DIR = temp/obj
RCC_DIR = temp/qrc
UI_DIR = temp/ui
MOC_DIR = temp/moc
LIBS += -L"../../../../lib" -lretroshare -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz
LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32-cygwin -gdi32
LIBS += -lole32 -lwinmm
}
##################################### MacOS ######################################
macx {
# ENABLE THIS OPTION FOR Univeral Binary BUILD.
# CONFIG += ppc x86
LIBS += -Wl,-search_paths_first
}
############################## Common stuff ######################################
DEPENDPATH += ../../libretroshare/src
LIBS *= -lpthread
INCLUDEPATH += . ../../libretroshare/src
# Input
HEADERS += notifytxt.h
SOURCES += notifytxt.cc \
retroshare.cc
INCLUDEPATH += . ../../libretroshare/src
# Input
HEADERS += notifytxt.h
SOURCES += notifytxt.cc \
retroshare.cc