Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-13 16:39:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert changes for Windows compile in libretroshare.pro after merging gxs_phase2 branch.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6407 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-06-05 14:19:21 +00:00
parent 9c69ad0500
commit faac2987db
1 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libretroshare/src/libretroshare.pro
View File

@ -197,8 +197,6 @@ win32-x-g++ {
} }
################################# Windows ########################################## ################################# Windows ##########################################
win32 { win32 {
QMAKE_CC = g++ QMAKE_CC = g++
OBJECTS_DIR = temp/obj OBJECTS_DIR = temp/obj
@ -225,23 +223,22 @@ win32 {
CONFIG += upnp_miniupnpc CONFIG += upnp_miniupnpc
UPNPC_DIR = ../../../lib/miniupnpc-1.3 UPNPC_DIR = ../../../miniupnpc-1.3
PTHREADS_DIR = ../../../lib/pthreads-w32-2-8-0-release
ZLIB_DIR = ../../../lib/zlib-1.2.3 PTHREADS_DIR = ../../../pthreads-w32-2-8-0-release
SSL_DIR = ../../../OpenSSL ZLIB_DIR = ../../../zlib-1.2.3
SSL_DIR = ../../../openssl-1.0.1c
OPENPGPSDK_DIR = ../../openpgpsdk/src OPENPGPSDK_DIR = ../../openpgpsdk/src
INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${PTHREADS_DIR} $${ZLIB_DIR} $${OPENPGPSDK_DIR} INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${PTHREADS_DIR} $${ZLIB_DIR} $${OPENPGPSDK_DIR}
# 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 += . \ INCLUDEPATH += $${SQLITE_DIR}
$${SQLITE_DIR}
} }
} }
################################# MacOSX ########################################## ################################# MacOSX ##########################################
mac { mac {