Completed install-building script for current functionality

This commit is contained in:
Jean-Francois Dockes
2015-10-12 12:29:44 +02:00
parent 3d6c12365c
commit 15ef686e4e
4 changed files with 81 additions and 30 deletions
+3 -3
View File
@@ -116,11 +116,11 @@ windows {
contains(QMAKE_CC, cl){
# Visual Studio
}
LIBS += c:/recolldeps/xapian/xapian-core-1.2.21/.libs/libxapian-22.dll \
c:/recolldeps/zlib-1.2.8/zlib1.dll -liconv -lshlwapi -lpsapi -lkernel32
LIBS += c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll \
c:/temp/zlib-1.2.8/zlib1.dll -liconv -lshlwapi -lpsapi -lkernel32
INCLUDEPATH += ../../windows \
C:/recolldeps/xapian/xapian-core-1.2.8/include
C:/temp/xapian-core-1.2.21/include
}
unix {
+2 -4
View File
@@ -30,10 +30,8 @@ windows {
}
LIBS += \
C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/librecoll.dll \
c:/recolldeps/xapian/xapian-core-1.2.21/.libs/libxapian-22.dll \
c:/recolldeps/zlib-1.2.8/zlib1.dll \
-liconv -lshlwapi -lpsapi -lkernel32
-lshlwapi -lpsapi -lkernel32
INCLUDEPATH += ../../windows \
C:/recolldeps/xapian/xapian-core-1.2.8/include
C:/temp/xapian-core-1.2.8/include
}
+1 -3
View File
@@ -28,9 +28,7 @@ windows {
}
LIBS += \
C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/librecoll.dll \
c:/recolldeps/xapian/xapian-core-1.2.21/.libs/libxapian-22.dll \
c:/recolldeps/zlib-1.2.8/zlib1.dll \
-liconv -lshlwapi -lpsapi -lkernel32
-lshlwapi -lpsapi -lkernel32
INCLUDEPATH += ../../windows \
C:/recolldeps/xapian/xapian-core-1.2.8/include