mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-28 08:59:37 -05:00
Fixed compile of gxs on Windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5999 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
a3901d2b6b
commit
f764a82408
@ -249,7 +249,7 @@ win32 {
|
||||
|
||||
# SQLite include path is required to compile GXS.
|
||||
gxs {
|
||||
SQLITE_DIR = ../../../../Libraries/sqlite/sqlite-autoconf-3070900
|
||||
SQLITE_DIR = ../../../sqlite-autoconf-3070900
|
||||
INCLUDEPATH += $${SQLITE_DIR}
|
||||
}
|
||||
|
||||
|
@ -152,11 +152,10 @@ win32 {
|
||||
LIBS += -lole32 -lwinmm
|
||||
RC_FILE = gui/images/retroshare_win.rc
|
||||
|
||||
gxs {
|
||||
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
|
||||
LIBS += C:\Development\Libraries\sqlite\sqlite-autoconf-3070900\.libs\libsqlite3.a
|
||||
#LIBS += -lsqlite3
|
||||
}
|
||||
gxs {
|
||||
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
|
||||
LIBS += -lsqlite3
|
||||
}
|
||||
|
||||
# export symbols for the plugins
|
||||
LIBS += -Wl,--export-all-symbols,--out-implib,lib/libretroshare-gui.a
|
||||
|
@ -85,13 +85,15 @@ win32 {
|
||||
RC_FILE = resources/retroshare_win.rc
|
||||
|
||||
DEFINES *= WINDOWS_SYS
|
||||
|
||||
SSH_DIR = ../../../libssh-0.5.2
|
||||
SSL_DIR = ../../../openssl-1.0.1c
|
||||
|
||||
INCLUDEPATH += . $${SSH_DIR}/include $${SSL_DIR}/include
|
||||
|
||||
|
||||
SSL_DIR = ../../../openssl-1.0.1c
|
||||
|
||||
INCLUDEPATH += . $${SSL_DIR}/include
|
||||
|
||||
gxs {
|
||||
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
|
||||
LIBS += -lsqlite3
|
||||
}
|
||||
}
|
||||
|
||||
##################################### MacOS ######################################
|
||||
@ -252,7 +254,3 @@ protorpc {
|
||||
QMAKE_CXXFLAGS += -pthread
|
||||
LIBS += -lprotobuf
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user