yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix chrono change for mingw. Actually use the release lib in other builds

Browse source
This commit is contained in:
Jean-Francois Dockes 2015-10-14 09:44:43 +02:00
parent cc73d47cb0
commit ba21b2f27e
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/qtgui/recoll-win.pro
View file

@ -108,7 +108,7 @@ windows {
contains(QMAKE_CC, cl){ contains(QMAKE_CC, cl){
# Visual Studio # Visual Studio
} }
LIBS += C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/librecoll.dll LIBS += C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Release/release/librecoll.dll
} }
TRANSLATIONS = \ TRANSLATIONS = \

2
src/utils/chrono.cpp
View file

@ -58,7 +58,7 @@ typedef int clockid_t;
#undef USE_CLOCK_GETTIME #undef USE_CLOCK_GETTIME
#endif #endif
#ifdef _WIN32 #ifdef _MSC_VER
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <Windows.h> #include <Windows.h>
#include <stdint.h> // portable: uint64_t MSVC: __int64 #include <stdint.h> // portable: uint64_t MSVC: __int64

2
src/windows/qmkrecoll/recollindex.pro
View file

@ -29,7 +29,7 @@ windows {
# Visual Studio # Visual Studio
} }
LIBS += \ LIBS += \
C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/librecoll.dll \ C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Release/release/librecoll.dll \
-lshlwapi -lpsapi -lkernel32 -lshlwapi -lpsapi -lkernel32
INCLUDEPATH += ../../windows INCLUDEPATH += ../../windows

2
src/windows/qmkrecoll/recollq.pro
View file

@ -27,7 +27,7 @@ windows {
# Visual Studio # Visual Studio
} }
LIBS += \ LIBS += \
C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/librecoll.dll \ C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Release/release/librecoll.dll \
-lshlwapi -lpsapi -lkernel32 -lshlwapi -lpsapi -lkernel32
INCLUDEPATH += ../../windows INCLUDEPATH += ../../windows