Commit c2719e47 authored by Boris Kocherov's avatar Boris Kocherov

DISABLE_FILE_DOWNLOADER

parent 25c29936
...@@ -190,16 +190,17 @@ SOURCES += \ ...@@ -190,16 +190,17 @@ SOURCES += \
../../../ASCOfficePPTXFile/Editor/Drawing/TextAttributesEx.cpp \ ../../../ASCOfficePPTXFile/Editor/Drawing/TextAttributesEx.cpp \
../../../Common/3dParty/pole/pole.cpp ../../../Common/3dParty/pole/pole.cpp
core_windows { use_curl {
SOURCES += \ core_windows {
../../../Common/FileDownloader/FileDownloader_win.cpp SOURCES += \
} ../../../Common/FileDownloader/FileDownloader_win.cpp
core_linux { }
SOURCES += \ core_linux {
../../../Common/FileDownloader/FileDownloader_curl.cpp SOURCES += \
../../../Common/FileDownloader/FileDownloader_curl.cpp
}
core_mac {
OBJECTIVE_SOURCES += \
../../../Common/FileDownloader/FileDownloader_mac.mm
}
} }
core_mac {
OBJECTIVE_SOURCES += \
../../../Common/FileDownloader/FileDownloader_mac.mm
}
...@@ -502,15 +502,17 @@ HEADERS += pptxformatlib.h \ ...@@ -502,15 +502,17 @@ HEADERS += pptxformatlib.h \
../../../PPTXFormat/ShowPr/SldAll.h \ ../../../PPTXFormat/ShowPr/SldAll.h \
../../../PPTXFormat/ShowPr/SldRg.h ../../../PPTXFormat/ShowPr/SldRg.h
core_windows { use_curl {
SOURCES += \ core_windows {
../../../../Common/FileDownloader/FileDownloader_win.cpp SOURCES += \
} ../../../../Common/FileDownloader/FileDownloader_win.cpp
core_linux { }
SOURCES += \ core_linux {
../../../../Common/FileDownloader/FileDownloader_curl.cpp SOURCES += \
} ../../../../Common/FileDownloader/FileDownloader_curl.cpp
core_mac { }
OBJECTIVE_SOURCES += \ core_mac {
../../../../Common/FileDownloader/FileDownloader_mac.mm OBJECTIVE_SOURCES += \
../../../../Common/FileDownloader/FileDownloader_mac.mm
}
} }
...@@ -155,3 +155,6 @@ core_windows { ...@@ -155,3 +155,6 @@ core_windows {
DEFINES += CRYPTOPP_DISABLE_ASM DEFINES += CRYPTOPP_DISABLE_ASM
} }
!use_curl {
DEFINES += DISABLE_FILE_DOWNLOADER
}
...@@ -161,7 +161,9 @@ core_windows { ...@@ -161,7 +161,9 @@ core_windows {
core_linux { core_linux {
LIBS += -lz LIBS += -lz
LIBS += -lxml2 LIBS += -lxml2
LIBS += -lcurl use_curl {
LIBS += -lcurl
}
} }
mac { mac {
......
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