diff --git a/.gitignore b/.gitignore index d0d1852fc3..acf1ce5012 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ Common/3dParty/v8/win_32 Common/3dParty/v8/linux_64 Common/3dParty/v8/linux_32 Common/3dParty/v8/mac_64 +**/core_build **/Release **/Debug *.user diff --git a/Common/3dParty/boost/boost.pri b/Common/3dParty/boost/boost.pri new file mode 100644 index 0000000000..36b6d9f068 --- /dev/null +++ b/Common/3dParty/boost/boost.pri @@ -0,0 +1,25 @@ +INCLUDEPATH += $$PWD/boost_1_58_0 + +CORE_BOOST_LIBS = $$PWD/boost_1_58_0/build/$$CORE_BUILDS_PLATFORM_PREFIX/static + +core_boost_fpic { + CORE_BOOST_LIBS = $$PWD/boost_1_58_0/build/$$CORE_BUILDS_PLATFORM_PREFIX/static_fpic +} +core_boost_shared { + CORE_BOOST_LIBS = $$PWD/boost_1_58_0/build/$$CORE_BUILDS_PLATFORM_PREFIX/shared +} + +core_boost_libs { + +core_windows { +core_debug { + LIBS += -L$$CORE_BOOST_LIBS -llibboost_system-vc120-mt-gd-1_58 -llibboost_filesystem-vc120-mt-gd-1_58 +} +core_release { + LIBS += -L$$CORE_BOOST_LIBS -llibboost_system-vc120-mt-1_58 -llibboost_filesystem-vc120-mt-1_58 +} +} else { + LIBS += -L$$CORE_BOOST_LIBS -lboost_system -lboost_filesystem +} + +} diff --git a/Common/3dParty/boost/build.bat b/Common/3dParty/boost/build.bat index 5fa6675415..e41d0ed16b 100644 --- a/Common/3dParty/boost/build.bat +++ b/Common/3dParty/boost/build.bat @@ -1,18 +1,44 @@ SET SCRIPTPATH=%~dp0 CD /D %~dp0 -SET platform=win_32 -if defined ProgramFiles(x86) ( - SET platform=win_64 -) - SET outputdir=%SCRIPTPATH%boost_1_58_0\build\%platform% echo "%outputdir%" CD "%SCRIPTPATH%\boost_1_58_0" call .\bootstrap.bat -SET folder=build/%platform% +if exist "stage" ( + RMDIR "stage" /S /Q +) + +md build + +SET folder=build/win_32 +echo "x86..." + +if exist "%folder%" ( + RMDIR "%folder%" /S /Q +) +md %folder% +md %folder%\static +md %folder%\static_fpic +md %folder%\shared + +.\b2.exe --clean +.\bjam.exe link=static --with-filesystem --with-system --with-date_time +XCOPY stage\lib\* "%folder%\static\" + +.\b2.exe --clean +.\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system --with-date_time +XCOPY stage\lib\* "%folder%\static_fpic\" + +.\b2.exe --clean +.\bjam.exe link=shared --with-filesystem --with-system --with-date_time +XCOPY stage\lib\* "%folder%\shared\" + +SET folder=build/win_64 +echo "x64..." + if exist "%folder%" ( RMDIR "%folder%" /S /Q ) @@ -21,21 +47,19 @@ if exist "stage" ( RMDIR "stage" /S /Q ) -md build md %folder% md %folder%\static md %folder%\static_fpic md %folder%\shared .\b2.exe --clean -.\bjam.exe link=static --with-filesystem --with-system +.\bjam.exe link=static --with-filesystem --with-system --with-date_time address-model=64 XCOPY stage\lib\* "%folder%\static\" .\b2.exe --clean -.\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system +.\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system --with-date_time address-model=64 XCOPY stage\lib\* "%folder%\static_fpic\" .\b2.exe --clean -.\bjam.exe link=shared --with-filesystem --with-system -XCOPY stage\lib\* "%folder%\shared\" - +.\bjam.exe link=shared --with-filesystem --with-system --with-date_time address-model=64 +XCOPY stage\lib\* "%folder%\shared\" \ No newline at end of file diff --git a/Common/3dParty/boost/build.sh b/Common/3dParty/boost/build.sh index ca405ecb10..8fc50536d3 100644 --- a/Common/3dParty/boost/build.sh +++ b/Common/3dParty/boost/build.sh @@ -24,7 +24,7 @@ outputdir="$SCRIPTPATH/boost_1_58_0/build/$platform$arch" echo $outputdir cd "$SCRIPTPATH/boost_1_58_0" -./bootstrap.sh --with-libraries=filesystem,system +./bootstrap.sh --with-libraries=filesystem,system,date_time folder="build/$platform$arch" if [ -d $folder ]; then diff --git a/Common/3dParty/icu/icu.pri b/Common/3dParty/icu/icu.pri new file mode 100644 index 0000000000..868be10927 --- /dev/null +++ b/Common/3dParty/icu/icu.pri @@ -0,0 +1,31 @@ +CORE_V8_PATH_INCLUDE = $$CORE_ROOT_DIR/Common/3dParty/v8/v8 +CORE_V8_PATH_LIBS = $$CORE_ROOT_DIR/Common/3dParty/v8/$$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX + +INCLUDEPATH += \ + $$CORE_V8_PATH_INCLUDE \ + $$CORE_V8_PATH_INCLUDE/include + +core_windows { + INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/icu/include +} + +core_win_64 { + LIBS += -L$$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/icu/lib64 -licuuc +} +core_win_32 { + LIBS += -L$$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/icu/lib -licuuc +} + +core_linux { + INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/usr/local/include + + LIBS += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.so.55 + LIBS += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.so.55 +} + +core_mac { + INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/icu/source/common + + LIBS += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.55.1.dylib + LIBS += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.55.1.dylib +} diff --git a/DjVuFile/DjVuFile.pro b/DjVuFile/DjVuFile.pro index 1cabaea528..bb2e72adba 100644 --- a/DjVuFile/DjVuFile.pro +++ b/DjVuFile/DjVuFile.pro @@ -1,128 +1,32 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2015-05-18T16:30:42 -# -#------------------------------------------------- - QT -= core gui VERSION = 1.0.0.3 TARGET = DjVuFile TEMPLATE = lib -#CONFIG += staticlib CONFIG += shared +CONFIG += plugin -############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../build/lib +CONFIG += core_static_link_libstd -# WINDOWS -win32:contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG -} else { - DESTDIR = $$DESTINATION_SDK_PATH/win_64 -} -} -win32:!contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG -} else { - DESTDIR = $$DESTINATION_SDK_PATH/win_32 -} -} +DEFINES += DJVU_USE_DYNAMIC_LIBRARY -linux-g++:contains(QMAKE_HOST.arch, x86_64):{ - DESTDIR = $$DESTINATION_SDK_PATH/linux_64 -} -linux-g++:!contains(QMAKE_HOST.arch, x86_64):{ - DESTDIR = $$DESTINATION_SDK_PATH/linux_32 -} +CORE_ROOT_DIR = $$PWD/.. +PWD_ROOT_DIR = $$PWD +include(../Common/base.pri) -mac { - DESTDIR = $$DESTINATION_SDK_PATH/mac_64 -} +LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfWriter -################################################ +CONFIG += build_all_zlib build_zlib_as_sources +include(../OfficeUtils/OfficeUtils.pri) -LIBS_DESTDIR_PATH = $$DESTDIR +CONFIG += build_cximage_zlib_disable +include(../DesktopEditor/Qt_build/graphics/project/graphics.pri) +include(../DesktopEditor/xml/build/qt/libxml2.pri) -# теперь всегда с libstd -linux-g++ | linux-g++-64 | linux-g++-32 { - CONFIG += static_link_libstd -} -static_link_libstd { - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc -# DESTDIR_POSTFIX = _static_stdlib -# DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX - message(static_link_libstd) -} - -############# dynamic dependencies ############# -shared { - DEFINES += DJVU_USE_DYNAMIC_LIBRARY - - LIBS += -L$$LIBS_DESTDIR_PATH -lPdfWriter - - CONFIG += build_all_zlib build_zlib_as_sources - include(../OfficeUtils/OfficeUtils.pri) - - CONFIG += build_cximage_zlib_disable - LIB_GRAPHICS_PRI_PATH = ../DesktopEditor - include(../DesktopEditor/Qt_build/graphics/project/graphics.pri) - - LIB_XML_PRI_PATH = ../DesktopEditor/xml - include(../DesktopEditor/xml/build/qt/libxml2.pri) - - message(dynamic) - - win32 { - LIBS += -lgdi32 \ - -ladvapi32 \ - -luser32 \ - -lshell32 - - TARGET_EXT = .dll - } - - linux-g++ | linux-g++-64 | linux-g++-32 { - CONFIG += plugin - TARGET_EXT = .so - - QMAKE_CXXFLAGS += -fvisibility=hidden - QMAKE_CFLAGS += -fvisibility=hidden - } - - mac { - CONFIG += plugin - - QMAKE_CXXFLAGS += -fvisibility=hidden - QMAKE_CFLAGS += -fvisibility=hidden - } -} else { - LIBS += -L$$LIBS_DESTDIR_PATH -llibxml -} -################################################ - -CONFIG += c++11 - -DEFINES += \ - _QT \ - FT2_BUILD_LIBRARY \ - EXCLUDE_JPG_SUPPORT \ - MNG_SUPPORT_DISPLAY \ - MNG_SUPPORT_READ \ - MNG_SUPPORT_WRITE \ - MNG_ACCESS_CHUNKS \ - MNG_STORE_CHUNKS\ - MNG_ERROR_TELLTALE - -linux-g++ | linux-g++-64 | linux-g++-32 { +core_linux { DEFINES += \ HAVE_UNISTD_H \ - LINUX \ - _LINUX \ - _LINUX_QT \ HAVE_MBSTATE_T \ GCONTAINER_NO_MEMBER_TEMPLATES="1" \ HAS_WCHAR \ @@ -131,39 +35,24 @@ linux-g++ | linux-g++-64 | linux-g++-32 { HAVE_STDINCLUDES } -mac { +core_mac { DEFINES += \ - HAVE_UNISTD_H \ - LINUX \ - _LINUX \ - _LINUX_QT \ + HAVE_UNISTD_H \ HAVE_MBSTATE_T \ GCONTAINER_NO_MEMBER_TEMPLATES="1" \ HAS_WCHAR \ HAVE_WCHAR_H \ UNIX \ - HAVE_STDINCLUDES \ - _MAC \ - MAC - - CONFIG += c++11 - - message(mac) + HAVE_STDINCLUDES } -win32 { - DEFINES += \ - JAS_WIN_MSVC_BUILD \ - WIN32 \ - NOMINMAX - - DEFINES -= UNICODE +core_windows { +LIBS += -lgdi32 \ + -ladvapi32 \ + -luser32 \ + -lshell32 } -INCLUDEPATH += \ - ../DesktopEditor/agg-2.4/include \ - ../DesktopEditor/freetype-2.5.2/include - SOURCES += DjVu.cpp \ DjVuFileImplementation.cpp \ libdjvu/Arrays.cpp \ @@ -274,8 +163,3 @@ HEADERS += DjVu.h \ libdjvu/XMLParser.h \ libdjvu/XMLTags.h \ libdjvu/ZPCodec.h - -unix { - target.path = /usr/lib - INSTALLS += target -} diff --git a/HtmlFile/HtmlFile.pro b/HtmlFile/HtmlFile.pro index ecb79915ed..13a05cd129 100644 --- a/HtmlFile/HtmlFile.pro +++ b/HtmlFile/HtmlFile.pro @@ -1,127 +1,33 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2015-05-18T16:30:42 -# -#------------------------------------------------- - QT -= core gui VERSION = 1.0.0.3 TARGET = HtmlFile TEMPLATE = lib -#CONFIG += staticlib CONFIG += shared +CONFIG += plugin -############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../build/lib - -# WINDOWS -win32:contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG -} else { - DESTDIR = $$DESTINATION_SDK_PATH/win_64 -} -} -win32:!contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG -} else { - DESTDIR = $$DESTINATION_SDK_PATH/win_32 -} -} - -linux-g++:contains(QMAKE_HOST.arch, x86_64):{ - DESTDIR = $$DESTINATION_SDK_PATH/linux_64 -} -linux-g++:!contains(QMAKE_HOST.arch, x86_64):{ - DESTDIR = $$DESTINATION_SDK_PATH/linux_32 -} - -mac { - DESTDIR = $$DESTINATION_SDK_PATH/mac_64 -} - -################################################ +CONFIG += core_static_link_libstd +DEFINES += HTMLFILE_USE_DYNAMIC_LIBRARY DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY -LIBS += -L$$DESTDIR -lUnicodeConverter -# теперь всегда с libstd -linux-g++ | linux-g++-64 | linux-g++-32 { - CONFIG += static_link_libstd -} -static_link_libstd { - DEFINES += asc_static_link_libstd - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc -# DESTDIR_POSTFIX = _static_stdlib -# DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX - message(static_link_libstd) + +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) + +core_linux { + DEFINES += asc_static_link_libstd } -############# dynamic dependencies ############# -shared { - DEFINES += HTMLFILE_USE_DYNAMIC_LIBRARY - - LIB_XML_PRI_PATH = ../DesktopEditor/xml - include(../DesktopEditor/xml/build/qt/libxml2.pri) - - message(dynamic) - - win32 { - TARGET_EXT = .dll - } - - linux-g++ | linux-g++-64 | linux-g++-32 { - CONFIG += plugin - TARGET_EXT = .so - - QMAKE_CXXFLAGS += -fvisibility=hidden - QMAKE_CFLAGS += -fvisibility=hidden - } - - mac { - CONFIG += plugin - - QMAKE_CXXFLAGS += -fvisibility=hidden - QMAKE_CFLAGS += -fvisibility=hidden - } -} -################################################ - -CONFIG += c++11 - -DEFINES += \ - _QT - -linux-g++ | linux-g++-64 | linux-g++-32 { - DEFINES += \ - LINUX \ - _LINUX \ - _LINUX_QT -} - -mac { - DEFINES += \ - LINUX \ - _LINUX \ - _LINUX_QT \ - _MAC \ - MAC -} - -win32 { - DEFINES += \ - WIN32 \ - NOMINMAX +core_windows { + DEFINES += NOMINMAX } SOURCES += HtmlFile.cpp - HEADERS += HtmlFile.h - -unix { - target.path = /usr/lib - INSTALLS += target -} diff --git a/HtmlRenderer/htmlrenderer.pro b/HtmlRenderer/htmlrenderer.pro index 23b9af980f..333eb10b19 100644 --- a/HtmlRenderer/htmlrenderer.pro +++ b/HtmlRenderer/htmlrenderer.pro @@ -1,9 +1,3 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2015-01-19T10:22:14 -# -#------------------------------------------------- - QT -= core QT -= gui @@ -11,130 +5,30 @@ VERSION = 1.0.0.3 TARGET = HtmlRenderer TEMPLATE = lib -QMAKE_CXXFLAGS += -std=c++11 - -CONFIG -= debug_and_release debug_and_release_target - -#CONFIG += staticlib CONFIG += shared +CONFIG += plugin -############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../build/lib +CONFIG += core_static_link_libstd -# WINDOWS -win32:contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG -} else { - DESTDIR = $$DESTINATION_SDK_PATH/win_64 +DEFINES += HTMLRENDERER_USE_DYNAMIC_LIBRARY + +CORE_ROOT_DIR = $$PWD/.. +PWD_ROOT_DIR = $$PWD +include(../Common/base.pri) + +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) + +core_windows { +LIBS += -lgdi32 \ + -ladvapi32 \ + -luser32 \ + -lshell32 } -} -win32:!contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG -} else { - DESTDIR = $$DESTINATION_SDK_PATH/win_32 -} -} - -linux-g++:contains(QMAKE_HOST.arch, x86_64):{ - DESTDIR = $$DESTINATION_SDK_PATH/linux_64 -} -linux-g++:!contains(QMAKE_HOST.arch, x86_64):{ - DESTDIR = $$DESTINATION_SDK_PATH/linux_32 -} - -mac { - DESTDIR = $$DESTINATION_SDK_PATH/mac_64 -} - -################################################ - -LIBS_DESTDIR_PATH = $$DESTDIR -# теперь всегда с libstd -linux-g++ | linux-g++-64 | linux-g++-32 { - CONFIG += static_link_libstd -} -static_link_libstd { - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc -# DESTDIR_POSTFIX = _static_stdlib -# DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX - message(static_link_libstd) -} - -############# dynamic dependencies ############# -shared { - DEFINES += HTMLRENDERER_USE_DYNAMIC_LIBRARY - - CONFIG += build_all_zlib build_zlib_as_sources - include(../OfficeUtils/OfficeUtils.pri) - - CONFIG += build_cximage_zlib_disable - LIB_GRAPHICS_PRI_PATH = ../DesktopEditor - include(../DesktopEditor/Qt_build/graphics/project/graphics.pri) - - LIB_XML_PRI_PATH = ../DesktopEditor/xml - include(../DesktopEditor/xml/build/qt/libxml2.pri) - - message(dynamic) - - win32 { - LIBS += -lgdi32 \ - -ladvapi32 \ - -luser32 \ - -lshell32 - - TARGET_EXT = .dll - } - - linux-g++ | linux-g++-64 | linux-g++-32 { - CONFIG += plugin - - QMAKE_CXXFLAGS += -fvisibility=hidden - QMAKE_CFLAGS += -fvisibility=hidden - - TARGET_EXT = .so - } - - mac { - CONFIG += plugin - - QMAKE_CXXFLAGS += -fvisibility=hidden - QMAKE_CFLAGS += -fvisibility=hidden - } -} else { - LIBS += -L$$DESTDIR -llibxml -} -################################################ - -#################### WINDOWS ##################### -win32 { - DEFINES += \ - WIN32 -} -################################################## - -################### LINUX ######################## - -linux-g++ | linux-g++-64 | linux-g++-32 { - DEFINES += \ - LINUX \ - _LINUX \ - _LINUX_QT -} - -mac { - DEFINES += \ - HAVE_UNISTD_H \ - LINUX \ - _LINUX \ - _MAC \ - MAC - - message(mac) -} - -################################################## INCLUDEPATH += \ ../../DesktopEditor/agg-2.4/include \ @@ -158,8 +52,3 @@ HEADERS += \ src/Writer.h \ include/HTMLRenderer3.h \ src/Common2.h - -unix { - target.path = /usr/lib - INSTALLS += target -} diff --git a/PdfReader/PdfReader.pro b/PdfReader/PdfReader.pro index 2a7ba4941d..b53505dbce 100644 --- a/PdfReader/PdfReader.pro +++ b/PdfReader/PdfReader.pro @@ -1,169 +1,35 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2015-05-15T12:43:02 -# -#------------------------------------------------- - QT -= core gui VERSION = 1.0.0.4 TARGET = PdfReader TEMPLATE = lib -#CONFIG += staticlib CONFIG += shared +CONFIG += plugin -QMAKE_CXXFLAGS += -fvisibility=hidden -QMAKE_CFLAGS += -fvisibility=hidden +CONFIG += core_static_link_libstd -############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../build/lib +CORE_ROOT_DIR = $$PWD/.. +PWD_ROOT_DIR = $$PWD +include(../Common/base.pri) -# WINDOWS -win32:contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG -} else { - DESTDIR = $$DESTINATION_SDK_PATH/win_64 +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) + +core_windows { +LIBS += -lgdi32 \ + -ladvapi32 \ + -luser32 \ + -lshell32 } -} -win32:!contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG -} else { - DESTDIR = $$DESTINATION_SDK_PATH/win_32 -} -} - -linux-g++:contains(QMAKE_HOST.arch, x86_64):{ - DESTDIR = $$DESTINATION_SDK_PATH/linux_64 -} -linux-g++:!contains(QMAKE_HOST.arch, x86_64):{ - DESTDIR = $$DESTINATION_SDK_PATH/linux_32 -} - -mac { - DESTDIR = $$DESTINATION_SDK_PATH/mac_64 -} - -################################################ - -LIBS_DESTDIR_PATH = $$DESTDIR -# теперь всегда с libstd -linux-g++ | linux-g++-64 | linux-g++-32 { - CONFIG += static_link_libstd -} -static_link_libstd { - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc -# DESTDIR_POSTFIX = _static_stdlib -# DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX - message(static_link_libstd) -} - -############# dynamic dependencies ############# -shared { - DEFINES += PDFREADER_USE_DYNAMIC_LIBRARY - - CONFIG += build_all_zlib build_zlib_as_sources - include(../OfficeUtils/OfficeUtils.pri) - - CONFIG += build_cximage_zlib_disable - LIB_GRAPHICS_PRI_PATH = ../DesktopEditor - include(../DesktopEditor/Qt_build/graphics/project/graphics.pri) - - #include(../DesktopEditor/xml/build/qt/libxml2.pri) - - message(dynamic) - - win32 { - LIBS += -lgdi32 \ - -ladvapi32 \ - -luser32 \ - -lshell32 - - TARGET_EXT = .dll - } - - linux-g++ | linux-g++-64 | linux-g++-32 { - CONFIG += plugin - - QMAKE_CXXFLAGS += -fvisibility=hidden - QMAKE_CFLAGS += -fvisibility=hidden - - TARGET_EXT = .so - } - - mac { - CONFIG += plugin - - QMAKE_CXXFLAGS += -fvisibility=hidden - QMAKE_CFLAGS += -fvisibility=hidden - } -} else { - #LIBS += -L$$DESTDIR -llibxml -} -################################################ - -DEFINES += PDFREADER_LIBRARY \ - HTMLRENDERER_USE_DYNAMIC_LIBRARY -LIBS += -L$$DESTDIR -lHtmlRenderer - - -linux-g++ | linux-g++-64 | linux-g++-32 { - DEFINES += \ - HAVE_UNISTD_H \ - LINUX \ - _LINUX \ - _LINUX_QT - - CONFIG += c++11 - - message(linux) -} - -mac { - DEFINES += \ - HAVE_UNISTD_H \ - LINUX \ - _LINUX \ - _LINUX_QT \ - _MAC \ - MAC - - CONFIG += c++11 - - message(mac) -} - -DEFINES += \ - _QT \ - FT2_BUILD_LIBRARY \ - EXCLUDE_JPG_SUPPORT \ - MNG_SUPPORT_DISPLAY \ - MNG_SUPPORT_READ \ - MNG_SUPPORT_WRITE \ - MNG_ACCESS_CHUNKS \ - MNG_STORE_CHUNKS\ - MNG_ERROR_TELLTALE - -win32 { - DEFINES += \ - JAS_WIN_MSVC_BUILD \ - WIN32 \ - NOMINMAX - - QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings - - message(windows) -} - -INCLUDEPATH += \ - ../DesktopEditor/agg-2.4/include \ - ../DesktopEditor/freetype-2.5.2/include \ - ../DesktopEditor/cximage/jasper/include \ - ../DesktopEditor/cximage/jpeg \ - ../DesktopEditor/cximage/png \ - ../DesktopEditor/cximage/zlib SOURCES += \ Src/Annot.cpp \ @@ -275,8 +141,3 @@ HEADERS +=\ Src/XmlUtils.h \ Src/XRef.h \ PdfReader.h - -unix { - target.path = /usr/lib - INSTALLS += target -} diff --git a/PdfWriter/PdfWriter.pro b/PdfWriter/PdfWriter.pro index 24e436aa2c..883be63704 100644 --- a/PdfWriter/PdfWriter.pro +++ b/PdfWriter/PdfWriter.pro @@ -1,154 +1,33 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2015-05-15T12:43:02 -# -#------------------------------------------------- - QT -= core gui VERSION = 1.0.0.4 TARGET = PdfWriter TEMPLATE = lib -#CONFIG += staticlib CONFIG += shared +CONFIG += plugin -############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../build/lib +CONFIG += core_static_link_libstd -# WINDOWS -win32:contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG -} else { - DESTDIR = $$DESTINATION_SDK_PATH/win_64 +CORE_ROOT_DIR = $$PWD/.. +PWD_ROOT_DIR = $$PWD +include(../Common/base.pri) + +DEFINES += PDFWRITER_USE_DYNAMIC_LIBRARY + +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) + +core_windows { +LIBS += -lgdi32 \ + -ladvapi32 \ + -luser32 \ + -lshell32 } -} -win32:!contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG -} else { - DESTDIR = $$DESTINATION_SDK_PATH/win_32 -} -} - -linux-g++:contains(QMAKE_HOST.arch, x86_64):{ - DESTDIR = $$DESTINATION_SDK_PATH/linux_64 -} -linux-g++:!contains(QMAKE_HOST.arch, x86_64):{ - DESTDIR = $$DESTINATION_SDK_PATH/linux_32 -} - -mac { - DESTDIR = $$DESTINATION_SDK_PATH/mac_64 -} - -################################################ - -LIBS_DESTDIR_PATH = $$DESTDIR -# теперь всегда с libstd -linux-g++ | linux-g++-64 | linux-g++-32 { - CONFIG += static_link_libstd -} -static_link_libstd { - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc -# DESTDIR_POSTFIX = _static_stdlib -# DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX - message(static_link_libstd) -} - -############# dynamic dependencies ############# -shared { - DEFINES += PDFWRITER_USE_DYNAMIC_LIBRARY - - CONFIG += build_all_zlib build_zlib_as_sources - include(../OfficeUtils/OfficeUtils.pri) - - CONFIG += build_cximage_zlib_disable - LIB_GRAPHICS_PRI_PATH = ../DesktopEditor - include(../DesktopEditor/Qt_build/graphics/project/graphics.pri) - - message(dynamic) - - win32 { - LIBS += -lgdi32 \ - -ladvapi32 \ - -luser32 \ - -lshell32 - - TARGET_EXT = .dll - } - - linux-g++ | linux-g++-64 | linux-g++-32 { - CONFIG += plugin - TARGET_EXT = .so - - QMAKE_CXXFLAGS += -fvisibility=hidden - QMAKE_CFLAGS += -fvisibility=hidden - } - - mac { - CONFIG += plugin - - QMAKE_CXXFLAGS += -fvisibility=hidden - QMAKE_CFLAGS += -fvisibility=hidden - } -} -################################################ - -CONFIG += c++11 - -linux-g++ | linux-g++-64 | linux-g++-32 { - DEFINES += \ - HAVE_UNISTD_H \ - LINUX \ - _LINUX \ - _LINUX_QT - - message(linux) -} - -mac { - DEFINES += \ - HAVE_UNISTD_H \ - LINUX \ - _LINUX \ - _LINUX_QT \ - _MAC \ - MAC - - message(mac) -} - -DEFINES -= UNICODE - -DEFINES += \ - _QT \ - FT2_BUILD_LIBRARY \ - EXCLUDE_JPG_SUPPORT \ - MNG_SUPPORT_DISPLAY \ - MNG_SUPPORT_READ \ - MNG_SUPPORT_WRITE \ - MNG_ACCESS_CHUNKS \ - MNG_STORE_CHUNKS\ - MNG_ERROR_TELLTALE - -win32 { - DEFINES += \ - JAS_WIN_MSVC_BUILD \ - WIN32 \ - NOMINMAX - - message(windows) -} - -INCLUDEPATH += \ - ../DesktopEditor/agg-2.4/include \ - ../DesktopEditor/freetype-2.5.2/include \ - ../DesktopEditor/cximage/jasper/include \ - ../DesktopEditor/cximage/jpeg \ - ../DesktopEditor/cximage/png \ - ../DesktopEditor/cximage/zlib HEADERS += \ Src/Annotation.h \ @@ -199,9 +78,3 @@ SOURCES += \ Src/Utils.cpp \ OnlineOfficeBinToPdf.cpp \ PdfRenderer.cpp - - -unix { - target.path = /usr/lib - INSTALLS += target -} diff --git a/UnicodeConverter/UnicodeConverter.pro b/UnicodeConverter/UnicodeConverter.pro index 9386155ca2..ccc8d9c254 100644 --- a/UnicodeConverter/UnicodeConverter.pro +++ b/UnicodeConverter/UnicodeConverter.pro @@ -1,109 +1,25 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2015-05-15T12:43:02 -# -#------------------------------------------------- - QT -= core gui VERSION = 1.0.0.4 TARGET = UnicodeConverter TEMPLATE = lib -#CONFIG += staticlib CONFIG += shared -CONFIG += c++11 +CONFIG += plugin -QMAKE_CXXFLAGS += -fvisibility=hidden -QMAKE_CFLAGS += -fvisibility=hidden +CONFIG += core_static_link_libstd -linux-g++ | linux-g++-64 | linux-g++-32 { +CORE_ROOT_DIR = $$PWD/.. +PWD_ROOT_DIR = $$PWD +include(../Common/base.pri) + +DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY + +core_linux { QMAKE_LFLAGS += -Wl,--rpath=./ } -############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../build/lib -ICU_BUILDS_PLATFORM = mac - -# WINDOWS -win32:contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG -} else { - DESTDIR = $$DESTINATION_SDK_PATH/win_64 -} -ICU_BUILDS_PLATFORM = win_64 -} -win32:!contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG -} else { - DESTDIR = $$DESTINATION_SDK_PATH/win_32 -} -ICU_BUILDS_PLATFORM = win_32 -} - -linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{ - DESTDIR = $$DESTINATION_SDK_PATH/linux_64 - ICU_BUILDS_PLATFORM = linux_64 -} -linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{ - DESTDIR = $$DESTINATION_SDK_PATH/linux_32 - ICU_BUILDS_PLATFORM = linux_32 -} - -mac { - DESTDIR = $$DESTINATION_SDK_PATH/mac_64 - ICU_BUILDS_PLATFORM = mac -} - -################################################ - -LIBS_DESTDIR_PATH = $$DESTDIR -# теперь всегда с libstd -linux-g++ | linux-g++-64 | linux-g++-32 { - CONFIG += static_link_libstd -} -static_link_libstd { - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc -# DESTDIR_POSTFIX = _static_stdlib -# DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX - message(static_link_libstd) -} - -############# dynamic dependencies ############# -shared { - DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY -} -################################################ - -linux-g++ | linux-g++-64 | linux-g++-32 { - CONFIG += plugin - TARGET_EXT = .so - - INCLUDEPATH += /usr/local/include - LIBS += /usr/local/lib/libicuuc.so.55 - LIBS += /usr/local/lib/libicudata.so.55 - message(linux) -} - -win32 { - QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings - TARGET_EXT = .dll - - INCLUDEPATH += $$PWD/icubuilds/$$ICU_BUILDS_PLATFORM/include - LIBS += -L$$PWD/../build/bin/icu/$$ICU_BUILDS_PLATFORM -licuuc - message(windows) -} - -mac { - CONFIG += plugin - - INCLUDEPATH += $$PWD/icubuilds/$$ICU_BUILDS_PLATFORM/release-55-1/source/common - LIBS += $$PWD/icubuilds/$$ICU_BUILDS_PLATFORM/release-55-1/source/lib/libicuuc.55.1.dylib - LIBS += $$PWD/icubuilds/$$ICU_BUILDS_PLATFORM/release-55-1/source/lib/libicudata.55.1.dylib - message(mac) -} +include(../Common/3dParty/icu/icu.pri) SOURCES += \ UnicodeConverter.cpp diff --git a/XpsFile/XpsFile.pro b/XpsFile/XpsFile.pro index f0ba66f9b0..2a390a515e 100644 --- a/XpsFile/XpsFile.pro +++ b/XpsFile/XpsFile.pro @@ -1,160 +1,34 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2015-05-15T12:43:02 -# -#------------------------------------------------- - QT -= core gui VERSION = 1.0.0.3 TARGET = XpsFile TEMPLATE = lib -#CONFIG += staticlib CONFIG += shared +CONFIG += plugin -############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../build/lib +CONFIG += core_static_link_libstd -# WINDOWS -win32:contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG -} else { - DESTDIR = $$DESTINATION_SDK_PATH/win_64 +CORE_ROOT_DIR = $$PWD/.. +PWD_ROOT_DIR = $$PWD +include(../Common/base.pri) + +DEFINES += XPS_USE_DYNAMIC_LIBRARY +LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfWriter + +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) + +core_windows { +LIBS += -lgdi32 \ + -ladvapi32 \ + -luser32 \ + -lshell32 } -} -win32:!contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG -} else { - DESTDIR = $$DESTINATION_SDK_PATH/win_32 -} -} - -linux-g++:contains(QMAKE_HOST.arch, x86_64):{ - DESTDIR = $$DESTINATION_SDK_PATH/linux_64 -} -linux-g++:!contains(QMAKE_HOST.arch, x86_64):{ - DESTDIR = $$DESTINATION_SDK_PATH/linux_32 -} - -mac { - DESTDIR = $$DESTINATION_SDK_PATH/mac_64 -} - -################################################ - -LIBS_DESTDIR_PATH = $$DESTDIR -# теперь всегда с libstd -linux-g++ | linux-g++-64 | linux-g++-32 { - CONFIG += static_link_libstd -} -static_link_libstd { - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc -# DESTDIR_POSTFIX = _static_stdlib -# DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX - message(static_link_libstd) -} - -############# dynamic dependencies ############# -shared { - DEFINES += XPS_USE_DYNAMIC_LIBRARY - - LIBS += -L$$DESTDIR -lPdfWriter - - CONFIG += build_all_zlib build_zlib_as_sources - include(../OfficeUtils/OfficeUtils.pri) - - CONFIG += build_cximage_zlib_disable - LIB_GRAPHICS_PRI_PATH = ../DesktopEditor - include(../DesktopEditor/Qt_build/graphics/project/graphics.pri) - - LIB_XML_PRI_PATH = ../DesktopEditor/xml - include(../DesktopEditor/xml/build/qt/libxml2.pri) - - message(dynamic) - - win32 { - LIBS += -lgdi32 \ - -ladvapi32 \ - -luser32 \ - -lshell32 - - TARGET_EXT = .dll - } - - linux-g++ | linux-g++-64 | linux-g++-32 { - CONFIG += plugin - - QMAKE_CXXFLAGS += -fvisibility=hidden - QMAKE_CFLAGS += -fvisibility=hidden - - TARGET_EXT = .so - } - - mac { - CONFIG += plugin - - QMAKE_CXXFLAGS += -fvisibility=hidden - QMAKE_CFLAGS += -fvisibility=hidden - } -} else { - LIBS += -L$$DESTDIR -llibxml -} -################################################ - -CONFIG += c++11 - -linux-g++ | linux-g++-64 | linux-g++-32 { - DEFINES += \ - HAVE_UNISTD_H \ - LINUX \ - _LINUX \ - _LINUX_QT - - message(linux) -} - -mac { - DEFINES += \ - HAVE_UNISTD_H \ - LINUX \ - _LINUX \ - _LINUX_QT \ - _MAC \ - MAC - - message(mac) -} - -DEFINES += \ - _QT \ - FT2_BUILD_LIBRARY \ - EXCLUDE_JPG_SUPPORT \ - MNG_SUPPORT_DISPLAY \ - MNG_SUPPORT_READ \ - MNG_SUPPORT_WRITE \ - MNG_ACCESS_CHUNKS \ - MNG_STORE_CHUNKS\ - MNG_ERROR_TELLTALE - -win32 { - DEFINES += \ - JAS_WIN_MSVC_BUILD \ - WIN32 \ - NOMINMAX - - message(windows) -} - -INCLUDEPATH += \ - ../DesktopEditor/agg-2.4/include \ - ../DesktopEditor/freetype-2.5.2/include \ - ../DesktopEditor/cximage/jasper/include \ - ../DesktopEditor/cximage/jpeg \ - ../DesktopEditor/cximage/png \ - ../DesktopEditor/cximage/zlib HEADERS += \ XpsFile.h \ @@ -175,7 +49,3 @@ SOURCES += \ XpsLib/Utils.cpp \ XpsLib/WString.cpp -unix { - target.path = /usr/lib - INSTALLS += target -}