From 56635e4ce42a6697164d58744f01d5fdd0b369b9 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sun, 21 Oct 2012 11:51:38 +0000 Subject: [PATCH] Added more PRE_TARGETDEPS for Windows compile. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5700 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/retroshare-gui.pro | 3 ++- retroshare-nogui/src/retroshare-nogui.pro | 29 +++++++++++++---------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 651a8d940..6ea71301b 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -124,7 +124,8 @@ win32 { #LIBS += -L"D/Qt/2009.03/qt/plugins/imageformats" #QTPLUGIN += qjpeg - PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a + PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a + PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2 diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro index f64147b73..eef5a2fd0 100644 --- a/retroshare-nogui/src/retroshare-nogui.pro +++ b/retroshare-nogui/src/retroshare-nogui.pro @@ -44,24 +44,27 @@ win32-x-g++ { #################################### Windows ##################################### win32 { - CONFIG += console - OBJECTS_DIR = temp/obj - RCC_DIR = temp/qrc + CONFIG += console + OBJECTS_DIR = temp/obj + RCC_DIR = temp/qrc UI_DIR = temp/ui MOC_DIR = temp/moc - LIBS += ../../libretroshare/src/lib/libretroshare.a + PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a + PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a + + LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2 - LIBS += -L"../../../lib" -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz - LIBS += -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz + LIBS += -L"../../../lib" -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz + LIBS += -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz # added after bitdht -# LIBS += -lws2_32 - LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 - LIBS += -lole32 -lwinmm - - RC_FILE = resources/retroshare_win.rc - - DEFINES *= WINDOWS_SYS +# LIBS += -lws2_32 + LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 + LIBS += -lole32 -lwinmm + + RC_FILE = resources/retroshare_win.rc + + DEFINES *= WINDOWS_SYS } ##################################### MacOS ######################################