From 4cb984684d65e9c388072602ef69673089598d00 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Tue, 17 Apr 2018 12:06:02 +0300 Subject: [PATCH] HtmlFile builds --- HtmlFile/HtmlFile.cpp | 5 +++++ HtmlFile/HtmlFile.pro | 5 ++--- PdfReader/PdfReader.pro | 14 +++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/HtmlFile/HtmlFile.cpp b/HtmlFile/HtmlFile.cpp index c4872495ea..27f67dac12 100644 --- a/HtmlFile/HtmlFile.cpp +++ b/HtmlFile/HtmlFile.cpp @@ -29,6 +29,11 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ + +#ifdef WIN32 +#include +#endif + #include "HtmlFile.h" #include "../DesktopEditor/common/File.h" #include "../DesktopEditor/common/Directory.h" diff --git a/HtmlFile/HtmlFile.pro b/HtmlFile/HtmlFile.pro index 13a05cd129..2992e5bcc3 100644 --- a/HtmlFile/HtmlFile.pro +++ b/HtmlFile/HtmlFile.pro @@ -17,9 +17,8 @@ CORE_ROOT_DIR = $$PWD/.. PWD_ROOT_DIR = $$PWD include(../Common/base.pri) -LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter - -include(../DesktopEditor/xml/build/qt/libxml2.pri) +DEFINES += KERNEL_USE_DYNAMIC_LIBRARY +LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel core_linux { DEFINES += asc_static_link_libstd diff --git a/PdfReader/PdfReader.pro b/PdfReader/PdfReader.pro index fae45a980f..d3858a2579 100644 --- a/PdfReader/PdfReader.pro +++ b/PdfReader/PdfReader.pro @@ -17,18 +17,14 @@ DEFINES += PDFREADER_USE_DYNAMIC_LIBRARY DEFINES += HTMLRENDERER_USE_DYNAMIC_LIBRARY LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lHtmlRenderer -CONFIG += build_all_zlib build_zlib_as_sources -include(../OfficeUtils/OfficeUtils.pri) - -CONFIG += build_cximage_zlib_disable -include(../DesktopEditor/Qt_build/graphics/project/graphics.pri) -include(../DesktopEditor/xml/build/qt/libxml2.pri) - -#UnicodeConverter -LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter +DEFINES += KERNEL_USE_DYNAMIC_LIBRARY +DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY +LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics core_windows { +DEFINES -= NOMINMAX + LIBS += -lgdi32 \ -ladvapi32 \ -luser32 \