diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-06-05 02:32:01 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-06-17 12:47:14 +0000 |
commit | 56b1a63e670ed7e8c5cda4c86a23c347ce32a224 (patch) | |
tree | 944e043d34348b7e3bb0054212a2fd6e31804be1 /vcl | |
parent | 7eb4c6921850a5a377f6aa42ce4af85b145da01c (diff) |
install blacklist into user profile
Change-Id: I2571fcdde1689f1a168a5c5d6bd20785ce018927
Reviewed-on: https://gerrit.libreoffice.org/16332
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/Module_vcl.mk | 1 | ||||
-rw-r--r-- | vcl/Package_opengl_blacklist.mk | 16 | ||||
-rw-r--r-- | vcl/opengl/opengl_blacklist_windows.xml (renamed from vcl/opengl/win/blacklist.xml) | 0 |
3 files changed, 17 insertions, 0 deletions
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index aa26183c774e..4595375ba08c 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ CustomTarget_afm_hash \ Library_vcl \ Package_opengl \ + Package_opengl_blacklist \ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ StaticLibrary_vclmain \ $(if $(ENABLE_HEADLESS),, \ diff --git a/vcl/Package_opengl_blacklist.mk b/vcl/Package_opengl_blacklist.mk new file mode 100644 index 000000000000..b858a56eaa24 --- /dev/null +++ b/vcl/Package_opengl_blacklist.mk @@ -0,0 +1,16 @@ +# -*- 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_Package_Package,vcl_opengl_blacklist,$(SRCDIR)/vcl/opengl)) + +$(eval $(call gb_Package_add_files,vcl_opengl_blacklist,$(LIBO_SHARE_PRESETS_FOLDER)/config,\ + opengl_blacklist_windows.xml \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/vcl/opengl/win/blacklist.xml b/vcl/opengl/opengl_blacklist_windows.xml index 6ff92d049e54..6ff92d049e54 100644 --- a/vcl/opengl/win/blacklist.xml +++ b/vcl/opengl/opengl_blacklist_windows.xml |