From dbb72592e90c59ac7b51d05ea38171238bc3b340 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Wed, 8 Oct 2014 16:44:59 +0000 Subject: [PATCH] Replaced external library libcrypt32-cygwin.a by libcrypt32.a from MinGW for Windows compile. git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.5@7589 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/tests/gxs/data_service/nxs_tests.pro | 2 +- libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro | 2 +- libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro | 2 +- retroshare-gui/src/retroshare-gui.pro | 2 +- retroshare-nogui/src/retroshare-nogui.pro | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libretroshare/src/tests/gxs/data_service/nxs_tests.pro b/libretroshare/src/tests/gxs/data_service/nxs_tests.pro index 51193249d..3451bd84b 100644 --- a/libretroshare/src/tests/gxs/data_service/nxs_tests.pro +++ b/libretroshare/src/tests/gxs/data_service/nxs_tests.pro @@ -119,7 +119,7 @@ win32 { LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz -lbz2 # added after bitdht # LIBS += -lws2_32 - LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 + LIBS += -luuid -lole32 -liphlpapi -lcrypt32 -lgdi32 LIBS += -lole32 -lwinmm # export symbols for the plugins diff --git a/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro b/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro index 2cc6fe806..2a895cb4c 100644 --- a/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro +++ b/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro @@ -102,7 +102,7 @@ win32 { LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz -lbz2 # added after bitdht # LIBS += -lws2_32 - LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 + LIBS += -luuid -lole32 -liphlpapi -lcrypt32 -lgdi32 LIBS += -lole32 -lwinmm # export symbols for the plugins diff --git a/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro b/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro index 51193249d..3451bd84b 100644 --- a/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro +++ b/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro @@ -119,7 +119,7 @@ win32 { LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz -lbz2 # added after bitdht # LIBS += -lws2_32 - LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 + LIBS += -luuid -lole32 -liphlpapi -lcrypt32 -lgdi32 LIBS += -lole32 -lwinmm # export symbols for the plugins diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 3455105ad..96098ae22 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -168,7 +168,7 @@ win32 { LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz # added after bitdht # LIBS += -lws2_32 - LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 + LIBS += -luuid -lole32 -liphlpapi -lcrypt32 -lgdi32 LIBS += -lole32 -lwinmm RC_FILE = gui/images/retroshare_win.rc diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro index ce059c1ef..5fd98d318 100644 --- a/retroshare-nogui/src/retroshare-nogui.pro +++ b/retroshare-nogui/src/retroshare-nogui.pro @@ -84,7 +84,7 @@ win32 { LIBS += -lssl -lcrypto -lminiupnpc -lz # added after bitdht # LIBS += -lcrypto -lws2_32 -lgdi32 - LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin + LIBS += -luuid -lole32 -liphlpapi -lcrypt32 LIBS += -lole32 -lwinmm PROTOCPATH=$$LIBS_DIR/bin/