Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-21 04:44:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed compile of gxs on Windows.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5999 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-12-16 22:39:58 +00:00
parent a3901d2b6b
commit f764a82408
3 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/libretroshare.pro
View file

@ -249,7 +249,7 @@ win32 {
# SQLite include path is required to compile GXS. # SQLite include path is required to compile GXS.
gxs { gxs {
SQLITE_DIR = ../../../../Libraries/sqlite/sqlite-autoconf-3070900 SQLITE_DIR = ../../../sqlite-autoconf-3070900
INCLUDEPATH += $${SQLITE_DIR} INCLUDEPATH += $${SQLITE_DIR}
} }

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

@ -152,11 +152,10 @@ win32 {
LIBS += -lole32 -lwinmm LIBS += -lole32 -lwinmm
RC_FILE = gui/images/retroshare_win.rc RC_FILE = gui/images/retroshare_win.rc
gxs { gxs {
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
LIBS += C:\Development\Libraries\sqlite\sqlite-autoconf-3070900\.libs\libsqlite3.a LIBS += -lsqlite3
#LIBS += -lsqlite3 }
}
# export symbols for the plugins # export symbols for the plugins
LIBS += -Wl,--export-all-symbols,--out-implib,lib/libretroshare-gui.a LIBS += -Wl,--export-all-symbols,--out-implib,lib/libretroshare-gui.a

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

@ -85,13 +85,15 @@ win32 {
RC_FILE = resources/retroshare_win.rc RC_FILE = resources/retroshare_win.rc
DEFINES *= WINDOWS_SYS 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 ###################################### ##################################### MacOS ######################################
@ -252,7 +254,3 @@ protorpc {
QMAKE_CXXFLAGS += -pthread QMAKE_CXXFLAGS += -pthread
LIBS += -lprotobuf LIBS += -lprotobuf
} }