Allow use of boost libs which are located in /opt/boost by setting PREFIX (for header and lib).
This commit is contained in:
+6
-1
@@ -52,7 +52,12 @@ win32 {
|
||||
debug:LIBPATH += debug/lib
|
||||
release:LIBPATH += release/lib
|
||||
}
|
||||
mac {
|
||||
!win32{
|
||||
##### My release static build options
|
||||
#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
|
||||
INCLUDEPATH += $${PREFIX}/include
|
||||
}
|
||||
mac {
|
||||
# make it universal
|
||||
CONFIG += x86
|
||||
CONFIG -= ppc
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
# QMake pro-file for PokerTH db library
|
||||
|
||||
isEmpty( PREFIX ){
|
||||
PREFIX =/usr
|
||||
}
|
||||
|
||||
TEMPLATE = lib
|
||||
CODECFORSRC = UTF-8
|
||||
|
||||
@@ -44,6 +48,7 @@ win32{
|
||||
!win32{
|
||||
##### My release static build options
|
||||
#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
|
||||
INCLUDEPATH += $${PREFIX}/include
|
||||
}
|
||||
|
||||
mac{
|
||||
|
||||
@@ -372,6 +372,8 @@ unix:!mac {
|
||||
# QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
|
||||
# QMAKE_LFLAGS += -Wl,--gc-sections
|
||||
LIBPATH += lib
|
||||
LIBPATH += $${PREFIX}/lib
|
||||
INCLUDEPATH += $${PREFIX}/include
|
||||
LIB_DIRS = $${PREFIX}/lib \
|
||||
$${PREFIX}/lib64
|
||||
BOOST_FS = boost_filesystem \
|
||||
|
||||
+6
-1
@@ -1,5 +1,9 @@
|
||||
# QMake pro-file for PokerTH common library
|
||||
|
||||
isEmpty( PREFIX ){
|
||||
PREFIX =/usr
|
||||
}
|
||||
|
||||
TEMPLATE = lib
|
||||
CODECFORSRC = UTF-8
|
||||
|
||||
@@ -220,13 +224,14 @@ official_server{
|
||||
|
||||
win32{
|
||||
DEFINES += CURL_STATICLIB
|
||||
DEFINES += _WIN32_WINNT=0x0501
|
||||
DEFINES += _WIN32_WINNT=0x0501
|
||||
DEPENDPATH += src/net/win32/ src/core/win32
|
||||
INCLUDEPATH += ../boost/ ../GnuTLS/include ../gsasl/include ../curl/include ../zlib ../openssl/include
|
||||
}
|
||||
!win32{
|
||||
##### My release static build options
|
||||
#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
|
||||
INCLUDEPATH += $${PREFIX}/include
|
||||
}
|
||||
|
||||
mac{
|
||||
|
||||
+2
-1
@@ -193,7 +193,8 @@ unix : !mac {
|
||||
#QMAKE_LFLAGS += -Wl,--gc-sections
|
||||
|
||||
LIBPATH += lib
|
||||
|
||||
LIBPATH += $${PREFIX}/lib
|
||||
INCLUDEPATH += $${PREFIX}/include
|
||||
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64
|
||||
BOOST_FS = boost_filesystem boost_filesystem-mt
|
||||
BOOST_THREAD = boost_thread boost_thread-mt
|
||||
|
||||
Reference in New Issue
Block a user