tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Windows: small changes for porting back from msvc to mingw

Browse Source
This commit is contained in:
Jean-Francois Dockes
2020-04-07 09:40:00 +02:00
parent d85bf0ba41
commit 32ebd65ba8
6 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/windows/qmkrecoll/librecoll.pro
+14 -14
View File
@@ -138,28 +138,28 @@ windows {
RECOLLDEPS = C:/recolldeps
QMAKE_CXXFLAGS += -std=c++11 -pthread -Wno-unused-parameter
LIBS += \
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.mingw/libxslt.a \
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.mingw/libxml2.a \
$$RECOLLDEPS/xapian-core-1.4.11/.libs/libxapian-30.dll \
$$RECOLLDEPS/zlib-1.2.8/zlib1.dll \
$$RECOLLDEPS/mingw/libxslt/libxslt-1.1.29/win32/bin.mingw/libxslt.a \
$$RECOLLDEPS/mingw/libxml2/libxml2-2.9.4+dfsg1/win32/bin.mingw/libxml2.a \
$$RECOLLDEPS/mingw/xapian-core-1.4.11/.libs/libxapian-30.dll \
$$RECOLLDEPS/mingw/zlib-1.2.8/zlib1.dll \
-liconv -lshlwapi -lpsapi -lkernel32
INCLUDEPATH += ../../windows \
$$RECOLLDEPS/xapian-core-1.4.15/include \
$$RECOLLDEPS/libxslt/libxslt-1.1.29/ \
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/include
$$RECOLLDEPS/mingw/xapian-core-1.4.11/include \
$$RECOLLDEPS/mingw/libxslt/libxslt-1.1.29/ \
$$RECOLLDEPS/mingw/libxml2/libxml2-2.9.4+dfsg1/include
}
contains(QMAKE_CC, cl){
# Visual Studio
RECOLLDEPS = ../../../../recolldeps-vc
# MSVC
RECOLLDEPS = ../../../../recolldeps
CONFIG += staticlib
DEFINES += USING_STATIC_LIBICONV
INCLUDEPATH += ../../windows \
$$RECOLLDEPS/xapian-core-1.4.15/include \
$$RECOLLDEPS/zlib-1.2.11/ \
$$RECOLLDEPS/libxslt/libxslt-1.1.29/ \
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/include \
$$RECOLLDEPS/wlibiconv/include
$$RECOLLDEPS/msvc/xapian-core-1.4.15/include \
$$RECOLLDEPS/msvc/zlib-1.2.11/ \
$$RECOLLDEPS/msvc/libxslt/libxslt-1.1.29/ \
$$RECOLLDEPS/msvc/libxml2/libxml2-2.9.4+dfsg1/include \
$$RECOLLDEPS/msvc/wlibiconv/include
QMAKE_CXXFLAGS_WARN_ON -= -w34100
QMAKE_CXXFLAGS += -wd4100
}
src/windows/qmkrecoll/recollindex.pro
+4 -3
View File
@@ -27,12 +27,13 @@ windows {
# MingW
QMAKE_CXXFLAGS += -std=c++11 -pthread -Wno-unused-parameter
LIBS += \
C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll \
-lshlwapi -lpsapi -lkernel32
../build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll \
-lshlwapi -lpsapi -lkernel32
}
contains(QMAKE_CC, cl){
# MSVC
RECOLLDEPS = ../../../../recolldeps-vc
RECOLLDEPS = ../../../../recolldeps/msvc
DEFINES += USING_STATIC_LIBICONV
LIBS += \
-L../build-librecoll-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
src/windows/qmkrecoll/recollq.pro
+1 -1
View File
@@ -23,7 +23,7 @@ windows {
MingW
QMAKE_CXXFLAGS += -std=c++11 -Wno-unused-parameter
LIBS += \
C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll \
../build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll \
-lshlwapi -lpsapi -lkernel32
}
contains(QMAKE_CC, cl){