Kaydet (Commit) 3498cd3e authored tarafından Markus Mohrhard's avatar Markus Mohrhard

use a dynamic library for minidump shared code

This has the disadvantage to make the minidump_upload executable depend on LibreOffice libraries but there seems to be no other way to make the 7.1 SDK happy.

Change-Id: I82c37f503ed29cb50711eae7db22063f49747a48
Reviewed-on: https://gerrit.libreoffice.org/26055Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
üst 1a9e0f42
......@@ -10,11 +10,12 @@
$(eval $(call gb_Executable_Executable,minidump_upload))
$(eval $(call gb_Executable_use_libraries,minidump_upload,\
crashreport \
sal \
))
$(eval $(call gb_Executable_use_static_libraries,minidump_upload,\
minidump \
$(eval $(call gb_Executable_add_defs,minidump_upload,\
-DUNICODE \
))
$(eval $(call gb_Executable_use_external,minidump_upload,curl))
......
......@@ -14,7 +14,10 @@ $(eval $(call gb_Library_set_include,crashreport,\
-I$(SRCDIR)/desktop/inc \
))
$(eval $(call gb_Library_use_external,crashreport,breakpad))
$(eval $(call gb_Library_use_externals,crashreport,\
breakpad \
curl \
))
$(eval $(call gb_Library_add_defs,crashreport,\
-DCRASHREPORT_DLLIMPLEMENTATION \
......@@ -38,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,crashreport,\
$(eval $(call gb_Library_add_exception_objects,crashreport,\
desktop/source/app/crashreport \
desktop/source/minidump/minidump \
))
......
......@@ -19,7 +19,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
Library_sofficeapp \
$(if $(ENABLE_BREAKPAD), \
Library_crashreport \
StaticLibrary_minidump) \
) \
$(if $(ENABLE_HEADLESS),,Library_spl) \
Package_branding \
$(if $(CUSTOM_BRAND_DIR),Package_branding_custom) \
......
......@@ -14,6 +14,7 @@
#include <iostream>
#include <fstream>
#include <sstream>
#include <string>
#include <curl/curl.h>
......@@ -183,6 +184,8 @@ bool uploadContent(std::map<std::string, std::string>& parameters, std::string&
return true;
}
namespace crashreport {