From ebe43a2079bccb94e72739f4d0049db3d6657867 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 1 Feb 2009 14:05:24 +0000 Subject: [PATCH] Updated the .pro so as to do cross-compilation for windows on ubuntu. Sorry, I had to move the libraries in a different directory for consistency. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@965 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/RetroShare.pro | 114 ++++++++++++++++-------------- 1 file changed, 62 insertions(+), 52 deletions(-) diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index 11afa29ba..4d3728efa 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -1,17 +1,67 @@ -###################################################################### -# Automatically generated by qmake (2.00a) Fr 18. Aug 22:48:56 2006 -####################################################################### -OBJECTS_DIR = temp/obj +CONFIG += qt gui uic qrc +QT += network xml +TEMPLATE = app +TARGET = RetroShare + RCC_DIR = temp/qrc UI_DIR = temp/ui MOC_DIR = temp/moc -CONFIG += qt debug -QT += network xml -TEMPLATE = app -TARGET += +################################# Linux ########################################## -QMAKE_CXXFLAGS *= -g +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 +} + +#################### 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 +} + +#################################### 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 += -lqcheckers -lsmplayer + LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32-cygwin -gdi32 + LIBS += -lole32 -lwinmm + + RC_FILE = gui/images/retroshare_win.rc +} + +##################################### MacOS ###################################### + +macx { + # ENABLE THIS OPTION FOR Univeral Binary BUILD. + # CONFIG += ppc x86 + + LIBS += -Wl,-search_paths_first +} + +############################## Common stuff ###################################### DEPENDPATH += . \ rsiface \ @@ -392,7 +442,9 @@ SOURCES += main.cpp \ gui/feeds/SubFileItem.cpp \ gui/feeds/SubDestItem.cpp \ -RESOURCES += gui/images.qrc lang/lang.qrc gui/help/content/content.qrc games/qcheckers/qcheckers.qrc apps/smplayer/icons.qrc +RESOURCES += gui/images.qrc lang/lang.qrc gui/help/content/content.qrc +#RESOURCES += games/qcheckers/qcheckers.qrc apps/smplayer/icons.qrc + TRANSLATIONS += \ lang/retroshare_en.ts \ lang/retroshare_de.ts \ @@ -417,50 +469,8 @@ TRANSLATIONS += \ lang/retroshare_se.ts -!macx { - # On non-Mac, make the binary all lowercase - TARGET = RetroShare -} - -macx { - # ENABLE THIS OPTION FOR Univeral Binary BUILD. - # CONFIG += ppc x86 - - LIBS += -Wl,-search_paths_first -} - -win32-x-g++ { - OBJECTS_DIR = win32-x-g++/obj - RCC_DIR = win32-x-g++/qrc - UI_DIR = win32-x-g++/ui - MOC_DIR = win32-x-g++/moc - - RC_FILE = gui/images/retroshare_win.rc - - LIBS += -L"../../../../lib" -lretroshare -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz - LIBS += -lqcheckers -lsmplayer - LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32-cygwin -gdi32 - LIBS += -lole32 -lwinmm - } -win32 { - OBJECTS_DIR = temp/obj - RCC_DIR = temp/qrc - UI_DIR = temp/ui - MOC_DIR = temp/moc - RC_FILE = gui/images/retroshare_win.rc - LIBS += -L"../../../../lib" -lretroshare -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz - LIBS += -lqcheckers -lsmplayer - LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32-cygwin -gdi32 - LIBS += -lole32 -lwinmm - -} - -!win32 { - LIBS += -L../../../../lib -lretroshare -lminiupnpc ../../../../lib/libssl.a ../../../../lib/libcrypto.a - LIBS += -lqcheckers -lsmplayer -}