Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-13 08:35:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixed Windows compile.

Browse source 
- Set name for prl file in libretroshare.pro
- Use "QMAKE_LFLAGS += -Wl,--start-group" to solve link issue
This commit is contained in:
thunder2 2015-09-03 13:11:12 +02:00
parent 97237c867c
commit b1b2de617a
3 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/libretroshare.pro
View file

@ -5,6 +5,7 @@ CONFIG += staticlib bitdht
CONFIG += create_prl CONFIG += create_prl
CONFIG -= qt CONFIG -= qt
TARGET = retroshare TARGET = retroshare
TARGET_PRL = libretroshare
#GXS Stuff. #GXS Stuff.

12
retroshare-gui/src/retroshare-gui.pro
View file

@ -175,6 +175,9 @@ win32 {
QMAKE_CFLAGS += -Wextra QMAKE_CFLAGS += -Wextra
QMAKE_CXXFLAGS += -Wextra QMAKE_CXXFLAGS += -Wextra
# solve linker warnings because of the order of the libraries
QMAKE_LFLAGS += -Wl,--start-group
# Switch off optimization for release version # Switch off optimization for release version
QMAKE_CXXFLAGS_RELEASE -= -O2 QMAKE_CXXFLAGS_RELEASE -= -O2
QMAKE_CXXFLAGS_RELEASE += -O0 QMAKE_CXXFLAGS_RELEASE += -O0
@ -199,9 +202,7 @@ win32 {
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
LIBS += -lsqlcipher LIBS += -lsqlcipher
LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz -lws2_32
# added after bitdht
# LIBS += -lws2_32
LIBS += -luuid -lole32 -liphlpapi -lcrypt32 -lgdi32 LIBS += -luuid -lole32 -liphlpapi -lcrypt32 -lgdi32
LIBS += -lole32 -lwinmm LIBS += -lole32 -lwinmm
RC_FILE = gui/images/retroshare_win.rc RC_FILE = gui/images/retroshare_win.rc
@ -307,11 +308,6 @@ INCLUDEPATH += ../../libresapi/src
PRE_TARGETDEPS *= ../../libresapi/src/lib/libresapi.a PRE_TARGETDEPS *= ../../libresapi/src/lib/libresapi.a
LIBS += ../../libresapi/src/lib/libresapi.a -lmicrohttpd LIBS += ../../libresapi/src/lib/libresapi.a -lmicrohttpd
win32 {
# must be added after bitdht
LIBS += -lws2_32
}
# Input # Input
HEADERS += rshare.h \ HEADERS += rshare.h \
retroshare-gui/configpage.h \ retroshare-gui/configpage.h \

10
retroshare-nogui/src/retroshare-nogui.pro
View file

@ -75,6 +75,9 @@ win32 {
UI_DIR = temp/ui UI_DIR = temp/ui
MOC_DIR = temp/moc MOC_DIR = temp/moc
# solve linker warnings because of the order of the libraries
QMAKE_LFLAGS += -Wl,--start-group
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
LIBS_DIR = $$PWD/../../../libs LIBS_DIR = $$PWD/../../../libs
@ -82,8 +85,7 @@ win32 {
LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += -L"$$LIBS_DIR/lib" LIBS += -L"$$LIBS_DIR/lib"
LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz
# added after bitdht LIBS += -lcrypto -lws2_32 -lgdi32
# LIBS += -lcrypto -lws2_32 -lgdi32
LIBS += -luuid -lole32 -liphlpapi -lcrypt32 LIBS += -luuid -lole32 -liphlpapi -lcrypt32
LIBS += -lole32 -lwinmm LIBS += -lole32 -lwinmm
@ -353,7 +355,3 @@ protorpc {
INCLUDEPATH += $${PROTOPATH}/src INCLUDEPATH += $${PROTOPATH}/src
} }
} }
win32 {
# must be added after ssh
LIBS += -lcrypto -lws2_32 -lgdi32
}