From dd1f88a1bb6d901921400dd5e1b89c7ca6d1c6a5 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Wed, 8 Oct 2014 16:44:25 +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/trunk@7588 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 +- .../libretroshare/gxs/gen_exchange/genexchange_test.pro | 2 +- tests/unittests/unittests.pro | 2 +- 7 files changed, 7 insertions(+), 7 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 aa67a28ed..5873f47b2 100644 --- a/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro +++ b/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro @@ -104,7 +104,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 f15f3ab1f..f2632ad25 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -187,7 +187,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 5d055bb7d..8d5ff65b0 100644 --- a/retroshare-nogui/src/retroshare-nogui.pro +++ b/retroshare-nogui/src/retroshare-nogui.pro @@ -96,7 +96,7 @@ win32 { LIBS += -lssl -lcrypto -lpthread -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/ diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro b/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro index aa67a28ed..5873f47b2 100644 --- a/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro +++ b/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro @@ -104,7 +104,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/tests/unittests/unittests.pro b/tests/unittests/unittests.pro index 0114d4a04..f9be88fff 100644 --- a/tests/unittests/unittests.pro +++ b/tests/unittests/unittests.pro @@ -112,7 +112,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