13595f6220
The code had apparently rotten a bit,
* a wchar_t vs. char16_t confusion in desktop/source/app/updater.cxx
* code broken by 926e4e469d
"Rename online updater
functions and strcmp relpath" in
onlineupdate/source/update/updater/updater.cxx
* -DUNICODE missing in some places (so that plain Windows functions resolve to
the ...W variant), which had been set centrally in the past IIRC
* silencing some warnings like "C4267: 'initializing': conversion from 'size_t'
to 'int', possible loss of data" (where silencing is the right thing to do for
effectively extern code); no sure why those apparently didn't hit in the past,
maybe it is all warnings that compilers only started to emit in recent years,
or only for recent -std:c++... modes
* silencing some "Conversion from string literal loses const qualifier" errors
with -Zc:strictStrings-; these hit at least with recent VS 2022 Preview and
--with-latest-c++, where -Zc:strictStrings is apparently now on by default
Change-Id: I7fe46f5aa2b42fc9c03f24f7f0236512b4d3b936
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160451
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
34 lines
949 B
Makefile
34 lines
949 B
Makefile
# -*- 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,libmarverify))
|
|
|
|
$(eval $(call gb_StaticLibrary_set_include,libmarverify,\
|
|
-I$(SRCDIR)/onlineupdate/source/libmar/src/ \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
ifneq ($(OS),WNT)
|
|
$(eval $(call gb_StaticLibrary_add_defs,libmarverify,\
|
|
-DMAR_NSS \
|
|
))
|
|
|
|
$(eval $(call gb_StaticLibrary_use_externals,libmarverify,\
|
|
nss3 \
|
|
))
|
|
endif
|
|
|
|
$(eval $(call gb_StaticLibrary_add_cobjects,libmarverify,\
|
|
onlineupdate/source/libmar/verify/mar_verify \
|
|
onlineupdate/source/libmar/verify/cryptox \
|
|
))
|
|
|
|
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,libmarverify))
|
|
|
|
# vim:set shiftwidth=4 tabstop=4 noexpandtab: */
|