Skip to content

O
onlyoffice_core
Commit f275c0a4 authored by Oleg Korshul's avatar Oleg Korshul
Browse files
Options

static link libstd

parent 43d23c16
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 27 deletions
DesktopEditor/doctrenderer/doctrenderer.pro
View file @ f275c0a4
...@@ -49,11 +49,14 @@ mac { ...@@ -49,11 +49,14 @@ mac {
################################################ ################################################
LIBS_DESTDIR_PATH = $$DESTDIR LIBS_DESTDIR_PATH = $$DESTDIR
#CONFIG += static_link_libstd # теперь всегда с libstd
linux-g++ | linux-g++-64 | linux-g++-32 {
CONFIG += static_link_libstd
}
static_link_libstd { static_link_libstd {
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
DESTDIR_POSTFIX = _static_stdlib # DESTDIR_POSTFIX = _static_stdlib
DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX # DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX
message(static_link_libstd) message(static_link_libstd)
} }
......
DjVuFile/DjVuFile.pro
View file @ f275c0a4
...@@ -46,11 +46,15 @@ mac { ...@@ -46,11 +46,15 @@ mac {
################################################ ################################################
LIBS_DESTDIR_PATH = $$DESTDIR LIBS_DESTDIR_PATH = $$DESTDIR
#CONFIG += static_link_libstd
# теперь всегда с libstd
linux-g++ | linux-g++-64 | linux-g++-32 {
CONFIG += static_link_libstd
}
static_link_libstd { static_link_libstd {
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
DESTDIR_POSTFIX = _static_stdlib # DESTDIR_POSTFIX = _static_stdlib
DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX # DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX
message(static_link_libstd) message(static_link_libstd)
} }
......
HtmlFile/HtmlFile.pro
View file @ f275c0a4
...@@ -48,12 +48,15 @@ mac { ...@@ -48,12 +48,15 @@ mac {
DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY
LIBS += -L$$DESTDIR -lUnicodeConverter LIBS += -L$$DESTDIR -lUnicodeConverter
#CONFIG += static_link_libstd # теперь всегда с libstd
static_link_libstd { linux-g++ | linux-g++-64 | linux-g++-32 {
DEFINES += asc_static_link_libstd CONFIG += static_link_libstd
}
static_link_libstd {
DEFINES += asc_static_link_libstd
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
DESTDIR_POSTFIX = _static_stdlib # DESTDIR_POSTFIX = _static_stdlib
DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX # DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX
message(static_link_libstd) message(static_link_libstd)
} }
......
HtmlRenderer/htmlrenderer.pro
View file @ f275c0a4
...@@ -51,11 +51,14 @@ mac { ...@@ -51,11 +51,14 @@ mac {
################################################ ################################################
LIBS_DESTDIR_PATH = $$DESTDIR LIBS_DESTDIR_PATH = $$DESTDIR
#CONFIG += static_link_libstd # теперь всегда с libstd
linux-g++ | linux-g++-64 | linux-g++-32 {
CONFIG += static_link_libstd
}
static_link_libstd { static_link_libstd {
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
DESTDIR_POSTFIX = _static_stdlib # DESTDIR_POSTFIX = _static_stdlib
DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX # DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX
message(static_link_libstd) message(static_link_libstd)
} }
......
PdfReader/PdfReader.pro
View file @ f275c0a4
...@@ -49,11 +49,14 @@ mac { ...@@ -49,11 +49,14 @@ mac {
################################################ ################################################
LIBS_DESTDIR_PATH = $$DESTDIR LIBS_DESTDIR_PATH = $$DESTDIR
#CONFIG += static_link_libstd # теперь всегда с libstd
linux-g++ | linux-g++-64 | linux-g++-32 {
CONFIG += static_link_libstd
}
static_link_libstd { static_link_libstd {
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
DESTDIR_POSTFIX = _static_stdlib # DESTDIR_POSTFIX = _static_stdlib
DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX # DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX
message(static_link_libstd) message(static_link_libstd)
} }
......
PdfWriter/PdfWriter.pro
View file @ f275c0a4
...@@ -46,11 +46,14 @@ mac { ...@@ -46,11 +46,14 @@ mac {
################################################ ################################################
LIBS_DESTDIR_PATH = $$DESTDIR LIBS_DESTDIR_PATH = $$DESTDIR
#CONFIG += static_link_libstd # теперь всегда с libstd
linux-g++ | linux-g++-64 | linux-g++-32 {
CONFIG += static_link_libstd
}
static_link_libstd { static_link_libstd {
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
DESTDIR_POSTFIX = _static_stdlib # DESTDIR_POSTFIX = _static_stdlib
DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX # DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX
message(static_link_libstd) message(static_link_libstd)
} }
......
UnicodeConverter/UnicodeConverter.pro
View file @ f275c0a4
...@@ -60,11 +60,14 @@ mac { ...@@ -60,11 +60,14 @@ mac {
################################################ ################################################
LIBS_DESTDIR_PATH = $$DESTDIR LIBS_DESTDIR_PATH = $$DESTDIR
#CONFIG += static_link_libstd # теперь всегда с libstd
linux-g++ | linux-g++-64 | linux-g++-32 {
CONFIG += static_link_libstd
}
static_link_libstd { static_link_libstd {
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
DESTDIR_POSTFIX = _static_stdlib # DESTDIR_POSTFIX = _static_stdlib
DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX # DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX
message(static_link_libstd) message(static_link_libstd)
} }
......
X2tConverter/build/Qt/X2tConverter.pro
View file @ f275c0a4
...@@ -46,9 +46,13 @@ win32 { ...@@ -46,9 +46,13 @@ win32 {
CONFIG += c++11 CONFIG += c++11
#CONFIG += static_link_libstd # теперь всегда с libstd
linux-g++ | linux-g++-64 | linux-g++-32 {
CONFIG += static_link_libstd
}
static_link_libstd { static_link_libstd {
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
message(static_link_libstd)
} }
#CONFIG += build_for_centos6 #CONFIG += build_for_centos6
......
XpsFile/XpsFile.pro
View file @ f275c0a4
...@@ -46,11 +46,14 @@ mac { ...@@ -46,11 +46,14 @@ mac {
################################################ ################################################
LIBS_DESTDIR_PATH = $$DESTDIR LIBS_DESTDIR_PATH = $$DESTDIR
#CONFIG += static_link_libstd # теперь всегда с libstd
linux-g++ | linux-g++-64 | linux-g++-32 {
CONFIG += static_link_libstd
}
static_link_libstd { static_link_libstd {
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
DESTDIR_POSTFIX = _static_stdlib # DESTDIR_POSTFIX = _static_stdlib
DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX # DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX
message(static_link_libstd) message(static_link_libstd)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7