RepositoryExternal.mk | 4 +- external/breakpad/ExternalProject_breakpad.mk | 8 ----- external/breakpad/Module_breakpad.mk | 11 +++++++ external/breakpad/StaticLibrary_breakpad.mk | 36 ++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 11 deletions(-)
New commits: commit ff9b7d118b34b53ec947af881fccd822e2aeb1fd Author: Markus Mohrhard <[email protected]> Date: Thu Mar 31 00:00:03 2016 +0200 support building breakpad on windows Change-Id: I74b0e5a8e922935c9667491e5f33c514c3315d2a Reviewed-on: https://gerrit.libreoffice.org/23667 Tested-by: Jenkins <[email protected]> Reviewed-by: Markus Mohrhard <[email protected]> diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3582790..6a36f9f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3329,8 +3329,8 @@ $(call gb_LinkTarget_set_include,$(1),\ ) ifeq ($(COM),MSC) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,breakpad)/build/win32/$(wnt_arch_subdir_optional)$(if $(MSVC_USE_DEBUG_RUNTIME),Debug/breakpad.lib,Release/breakpad.lib) \ +$(call gb_LinkTarget_use_static_libraries,$(1),\ + breakpad \ ) else $(call gb_LinkTarget_add_libs,$(1),\ diff --git a/external/breakpad/ExternalProject_breakpad.mk b/external/breakpad/ExternalProject_breakpad.mk index c0ea5df..70df68e 100644 --- a/external/breakpad/ExternalProject_breakpad.mk +++ b/external/breakpad/ExternalProject_breakpad.mk @@ -16,14 +16,6 @@ $(eval $(call gb_ExternalProject_register_targets,breakpad,\ ifeq ($(COM),MSC) -$(call gb_ExternalProject_get_state_target,breakpad,build) : - $(call gb_ExternalProject_run,build,\ - msbuild.exe breakpad.vcxproj /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \ - /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ - $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \ - $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 /p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \ - ,build/win32) - else # !ifeq($(COM),MSC) $(call gb_ExternalProject_get_state_target,breakpad,build) : diff --git a/external/breakpad/Module_breakpad.mk b/external/breakpad/Module_breakpad.mk index 3902c8e..3880760 100644 --- a/external/breakpad/Module_breakpad.mk +++ b/external/breakpad/Module_breakpad.mk @@ -12,7 +12,16 @@ $(eval $(call gb_Module_Module,breakpad)) $(eval $(call gb_Module_add_targets,breakpad,\ ExternalProject_breakpad \ UnpackedTarball_breakpad \ - ExternalPackage_breakpad \ )) +ifneq ($(OS)$(COM),WNTMSC) +$(eval $(call gb_Module_add_targets,breakpad,\ + ExternalProject_breakpad \ +)) +else +$(eval $(call gb_Module_add_targets,breakpad,\ + StaticLibrary_breakpad \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/external/breakpad/StaticLibrary_breakpad.mk b/external/breakpad/StaticLibrary_breakpad.mk new file mode 100644 index 0000000..bc6abdd --- /dev/null +++ b/external/breakpad/StaticLibrary_breakpad.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_StaticLibrary_StaticLibrary,breakpad)) + +$(eval $(call gb_StaticLibrary_set_warnings_not_errors,breakpad)) + +$(eval $(call gb_StaticLibrary_use_unpacked,breakpad,breakpad)) + +$(eval $(call gb_StaticLibrary_set_include,breakpad,\ + -I$(call gb_UnpackedTarball_get_dir,breakpad)/src \ + -I$(call gb_UnpackedTarball_get_dir,breakpad)/src/client/windows \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_StaticLibrary_add_defs,breakpad,\ + -DUNICODE \ +)) + +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,breakpad,cc)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,breakpad,\ + UnpackedTarball/breakpad/src/client/windows/handler/exception_handler \ + UnpackedTarball/breakpad/src/client/windows/crash_generation/client_info \ + UnpackedTarball/breakpad/src/client/windows/crash_generation/crash_generation_client \ + UnpackedTarball/breakpad/src/client/windows/crash_generation/crash_generation_server \ + UnpackedTarball/breakpad/src/client/windows/crash_generation/minidump_generator \ +)) + +# vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
