Commit 6370c8c2 authored by ElenaSubbotina's avatar ElenaSubbotina

Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop

parents 362cad18 01caf5cc
......@@ -44,6 +44,25 @@ mac {
DESTDIR = $$DESTINATION_SDK_PATH/mac_64
}
linux-g++ | linux-g++-64 | linux-g++-32 {
DEFINES += \
LINUX \
_LINUX
}
mac {
DEFINES += \
_LINUX \
_MAC \
MAC
}
win32 {
DEFINES += \
WIN32 \
_WIN32
}
################################################
INCLUDEPATH += \
......
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