diff --git a/Common/kernel.pro b/Common/kernel.pro index 741aededa4..aad1b8f357 100644 --- a/Common/kernel.pro +++ b/Common/kernel.pro @@ -10,7 +10,6 @@ CONFIG += plugin CONFIG += core_static_link_libstd -DEFINES += KERNEL_USE_DYNAMIC_LIBRARY DEFINES += KERNEL_USE_DYNAMIC_LIBRARY_BUILDING # CONFIG diff --git a/DesktopEditor/doctrenderer/doctrenderer.pro b/DesktopEditor/doctrenderer/doctrenderer.pro index 50901a1a00..f08560a34b 100644 --- a/DesktopEditor/doctrenderer/doctrenderer.pro +++ b/DesktopEditor/doctrenderer/doctrenderer.pro @@ -16,8 +16,6 @@ CORE_ROOT_DIR = $$PWD/../.. PWD_ROOT_DIR = $$PWD include(../../Common/base.pri) -DEFINES += KERNEL_USE_DYNAMIC_LIBRARY -DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics include(../../Common/3dParty/v8/v8.pri) diff --git a/DesktopEditor/graphics/pro/graphics.pro b/DesktopEditor/graphics/pro/graphics.pro index 946309441b..4803a8ad55 100644 --- a/DesktopEditor/graphics/pro/graphics.pro +++ b/DesktopEditor/graphics/pro/graphics.pro @@ -9,9 +9,9 @@ graphics_dynamic_library { CONFIG += shared CONFIG += plugin - DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY_BUILDING } else { + DEFINES += GRAPHICS_NO_USE_DYNAMIC_LIBRARY CONFIG += static } diff --git a/DjVuFile/DjVuFile.pro b/DjVuFile/DjVuFile.pro index d5a77ff9b2..df5a0b91e7 100644 --- a/DjVuFile/DjVuFile.pro +++ b/DjVuFile/DjVuFile.pro @@ -17,8 +17,6 @@ include(../Common/base.pri) LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfWriter -lUnicodeConverter -DEFINES += KERNEL_USE_DYNAMIC_LIBRARY -DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lkernel -lgraphics DEFINES -= \ diff --git a/HtmlFile/HtmlFile.pro b/HtmlFile/HtmlFile.pro index 66420f5fe9..0487b04c44 100644 --- a/HtmlFile/HtmlFile.pro +++ b/HtmlFile/HtmlFile.pro @@ -16,7 +16,6 @@ CORE_ROOT_DIR = $$PWD/.. PWD_ROOT_DIR = $$PWD include(../Common/base.pri) -DEFINES += KERNEL_USE_DYNAMIC_LIBRARY LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel core_linux { diff --git a/HtmlRenderer/htmlrenderer.pro b/HtmlRenderer/htmlrenderer.pro index 3201bea8d2..c89d281ad6 100644 --- a/HtmlRenderer/htmlrenderer.pro +++ b/HtmlRenderer/htmlrenderer.pro @@ -10,9 +10,6 @@ CONFIG += plugin CONFIG += core_static_link_libstd -DEFINES += KERNEL_USE_DYNAMIC_LIBRARY -DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY - DEFINES += HTMLRENDERER_USE_DYNAMIC_LIBRARY CORE_ROOT_DIR = $$PWD/.. diff --git a/PdfReader/PdfReader.pro b/PdfReader/PdfReader.pro index 68442a1b7e..4e2cd41b06 100644 --- a/PdfReader/PdfReader.pro +++ b/PdfReader/PdfReader.pro @@ -17,8 +17,6 @@ DEFINES += PDFREADER_USE_DYNAMIC_LIBRARY DEFINES += HTMLRENDERER_USE_DYNAMIC_LIBRARY LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lHtmlRenderer -DEFINES += KERNEL_USE_DYNAMIC_LIBRARY -DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics core_windows { diff --git a/PdfWriter/PdfWriter.pro b/PdfWriter/PdfWriter.pro index fad9052ee2..3150063fb2 100644 --- a/PdfWriter/PdfWriter.pro +++ b/PdfWriter/PdfWriter.pro @@ -15,8 +15,6 @@ include(../Common/base.pri) DEFINES += PDFWRITER_USE_DYNAMIC_LIBRARY -DEFINES += KERNEL_USE_DYNAMIC_LIBRARY -DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics DEFINES += NOMINMAX diff --git a/XpsFile/XpsFile.pro b/XpsFile/XpsFile.pro index f5f88a7ce4..60cb01eca2 100644 --- a/XpsFile/XpsFile.pro +++ b/XpsFile/XpsFile.pro @@ -16,8 +16,6 @@ include(../Common/base.pri) DEFINES += XPS_USE_DYNAMIC_LIBRARY LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfWriter -DEFINES += KERNEL_USE_DYNAMIC_LIBRARY -DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics core_windows {