summaryrefslogtreecommitdiff
path: root/external/zlib
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2019-05-24 11:45:26 +0200
committerLuboš Luňák <l.lunak@collabora.com>2019-05-24 13:46:03 +0200
commitcb7a39ac64253a6d0e11cfe1837ad3da2465c38e (patch)
tree300c05bf767b1e1bf6bd8b0f95911fb79054c2b5 /external/zlib
parentd6865e5cec34f5f521e0f9ec4ef3c7ad04503cfe (diff)
disable warnings in external libs
As in, really disable, so that they do not even show. This moreover avoids tons of D9025 warnings from MSVC about overriding -W4 with -w. Change-Id: Ia2e72fd72d883d91bdd89e467ee42f259e2ae033 Reviewed-on: https://gerrit.libreoffice.org/72899 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'external/zlib')
-rw-r--r--external/zlib/StaticLibrary_zlib.mk2
-rw-r--r--external/zlib/StaticLibrary_zlib_x64.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/external/zlib/StaticLibrary_zlib.mk b/external/zlib/StaticLibrary_zlib.mk
index eb309dcc5b7e..f5263bef7d91 100644
--- a/external/zlib/StaticLibrary_zlib.mk
+++ b/external/zlib/StaticLibrary_zlib.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,zlib))
$(eval $(call gb_StaticLibrary_use_unpacked,zlib,zlib))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,zlib))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,zlib))
$(eval $(call gb_StaticLibrary_add_generated_cobjects,zlib,\
UnpackedTarball/zlib/adler32 \
diff --git a/external/zlib/StaticLibrary_zlib_x64.mk b/external/zlib/StaticLibrary_zlib_x64.mk
index dd16655d1949..a51f326d11df 100644
--- a/external/zlib/StaticLibrary_zlib_x64.mk
+++ b/external/zlib/StaticLibrary_zlib_x64.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_set_x64,zlib_x64,YES))
$(eval $(call gb_StaticLibrary_use_unpacked,zlib_x64,zlib))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,zlib_x64))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,zlib_x64))
$(eval $(call gb_StaticLibrary_set_include,zlib_x64,\
-I$(call gb_UnpackedTarball_get_dir,zlib) \