pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Oleg Korshul
2025-04-06 13:22:47 +03:00
parent f441ec5c35
commit e5c7a043be
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Common/3dParty/boost/boost.pri
View File

@ -6,10 +6,6 @@ core_android:CONFIG += disable_enum_constexpr_conversion
core_mac:CONFIG += disable_enum_constexpr_conversion core_mac:CONFIG += disable_enum_constexpr_conversion
core_linux_clang:CONFIG += disable_enum_constexpr_conversion core_linux_clang:CONFIG += disable_enum_constexpr_conversion
core_linux_clang {
DEFINES += _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION
}
core_android { core_android {
INCLUDEPATH += $$PWD/build/android/include INCLUDEPATH += $$PWD/build/android/include
CORE_BOOST_LIBS = $$PWD/build/android/lib/$$CORE_BUILDS_PLATFORM_PREFIX CORE_BOOST_LIBS = $$PWD/build/android/lib/$$CORE_BUILDS_PLATFORM_PREFIX

17
Common/base.pri
View File

@ -134,10 +134,6 @@ linux-clang-32 {
message("linux-32-clang") message("linux-32-clang")
} }
core_linux_clang {
CONFIG += c++1z
}
linux-g++ { linux-g++ {
CONFIG += core_linux CONFIG += core_linux
linux-g++:contains(QMAKE_HOST.arch, x86_64): { linux-g++:contains(QMAKE_HOST.arch, x86_64): {
@ -225,6 +221,10 @@ core_mac {
} }
} }
core_linux_clang {
QMAKE_CFLAGS += -Wno-implicit-function-declaration
}
# PREFIXES # PREFIXES
core_windows { core_windows {
CONFIG -= debug_and_release debug_and_release_target CONFIG -= debug_and_release debug_and_release_target
@ -445,7 +445,14 @@ core_windows:CONFIG += no_batch
message($$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX) message($$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX)
# COMPILER # COMPILER
# CONFIG += c++11 CONFIG += c++11
#CONFIG += ENABLE_CPP_17
ENABLE_CPP_17 {
CONFIG += c++1z
DEFINES += _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION
}
!core_windows { !core_windows {
QMAKE_CXXFLAGS += -Wno-register QMAKE_CXXFLAGS += -Wno-register

4
DesktopEditor/xml/build/qt/libxml2.pri
View File

@ -1,7 +1,3 @@
core_linux_clang {
QMAKE_CFLAGS += -std=c99
}
DEFINES += HAVE_VA_COPY DEFINES += HAVE_VA_COPY
core_static_link_xml_full { core_static_link_xml_full {

3
OfficeUtils/OfficeUtils.pri
View File

@ -5,9 +5,6 @@ core_mac {
QMAKE_CXXFLAGS += -Wall -Wno-ignored-qualifiers QMAKE_CXXFLAGS += -Wall -Wno-ignored-qualifiers
DEFINES += unix DEFINES += unix
} }
core_linux_clang {
QMAKE_CFLAGS += -Wno-implicit-function-declaration
}
build_zlib_as_sources { build_zlib_as_sources {
DEFINES += BUILD_ZLIB_AS_SOURCES DEFINES += BUILD_ZLIB_AS_SOURCES