diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-15 11:03:29 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-15 11:03:29 +0100 |
| commit | 3c152e3703c74f468edb3ea7de9992bfc612dc04 (patch) | |
| tree | 8e91a84b64e85e9c6313ea672f119b298f80e7c3 | |
| parent | e50236fb9f7f845f0e33b12eb535055f948bcfce (diff) | |
Fix the build on Windows with MSVC
* Disable warnings
* Ensure we get the right library link search path
| -rw-r--r-- | src/lib/lib.pro | 2 | ||||
| -rw-r--r-- | src/qpdf/qpdf.pro | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/lib.pro b/src/lib/lib.pro index ce9bfdb..5350bee 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -2,6 +2,8 @@ TARGET = qtpdfium CONFIG += static hide_symbols warn_off rtti_off exceptions_off c++11 +DEFINES += NOMINMAX + load(qt_helper_lib) VPATH += ../3rdparty/pdfium diff --git a/src/qpdf/qpdf.pro b/src/qpdf/qpdf.pro index 337d955..ebe3c73 100644 --- a/src/qpdf/qpdf.pro +++ b/src/qpdf/qpdf.pro @@ -5,11 +5,15 @@ CONFIG += c++11 INCLUDEPATH += ../3rdparty/pdfium/fpdfsdk/include load(qt_module) -LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtpdfium$$qtPlatformTargetSuffix() +LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqtpdfium$$qtPlatformTargetSuffix() gcc { QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter } +msvc { + QMAKE_CXXFLAGS_WARN_ON += -wd"4100" +} + SOURCES += \ jsbridge.cpp |