This commit is contained in:
Jean-Francois Dockes
2015-10-09 08:09:27 +02:00
parent 408eee5080
commit 27cac1361b
4 changed files with 402 additions and 34 deletions
+11 -24
View File
@@ -1,10 +1,10 @@
# Note this is generated by configure on Linux (see recoll.pro.in).
# recoll.pro is under version control anyway and used on Windows
TEMPLATE = app
LANGUAGE = C++
QT += webkit
DEFINES += BUILDING_RECOLL
QT += webkit
# QMAKE_CXXFLAGS += -DRESLIST_TEXTBROWSER -DSNIPPETS_TEXTBROWSER
# QT += dbus
# QMAKE_CXXFLAGS += -DUSE_ZEITGEIST
@@ -12,7 +12,7 @@ QT += webkit
QT += xml
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webkitwidgets printsupport
CONFIG += qt warn_on thread debug
CONFIG += qt warn_on thread release
HEADERS += \
advsearch_w.h \
@@ -94,21 +94,6 @@ FORMS = \
RESOURCES = recoll.qrc
INCLUDEPATH += ../common ../index ../internfile ../query ../unac \
../utils ../aspell ../rcldb ../qtgui ../xaposix \
confgui
windows{
contains(QMAKE_CC, gcc){
# MingW
QMAKE_CXXFLAGS += -std=c++11 -Wno-unused-parameter
}
contains(QMAKE_CC, cl){
# Visual Studio
}
LIBS += C:/recoll/src/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/librecoll.dll
}
unix {
UI_DIR = .ui
MOC_DIR = .moc
@@ -119,13 +104,15 @@ unix {
# Note: libdir may be substituted with sthing like $(exec_prefix)/lib
# at this point and will go as such in the Makefile. Expansion will be
# completed at make time.
LIBS += -Wl,-rpath=@libdir@/recoll
LIBS += -Wl,-rpath=${exec_prefix}/lib/recoll
}
LIBS += @LIBXAPIAN@ $(LIBXAPIANSTATICEXTRA) \
@LIBICONV@ $(BDYNAMIC) @LIBQZEITGEIST@ -lz
LIBS += -lxapian $(LIBXAPIANSTATICEXTRA) \
-L${exec_prefix}/lib $(BDYNAMIC) -lz
INCLUDEPATH += ../common ../index ../internfile ../query ../unac \
../utils ../aspell ../rcldb ../qtgui ../xaposix \
confgui
DEPENDPATH += $$INCLUDEPATH
}