diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-10-22 20:00:30 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-11-19 13:47:40 +0100 |
commit | e4926e844e3f6bbd169aec7124fe185ee184c7fa (patch) | |
tree | 96695d8a89b0ae89a2880f32ee47f16739a17ed7 /chart2 | |
parent | 749d28227b8562431e2f10d47e3f511d535df430 (diff) |
fix windows build
Change-Id: I51942eb3719459abc0353a7fd024784f2c4abdb3
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/Library_chartopengl.mk | 7 | ||||
-rwxr-xr-x | chart2/inc/pch/precompiled_chartopengl.cxx | 18 | ||||
-rwxr-xr-x | chart2/inc/pch/precompiled_chartopengl.hxx | 12 | ||||
-rw-r--r-- | chart2/source/view/main/OpenglShapeFactory.cxx | 2 |
4 files changed, 36 insertions, 3 deletions
diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk index 0aa88e7b0865..f972353c8ffd 100644 --- a/chart2/Library_chartopengl.mk +++ b/chart2/Library_chartopengl.mk @@ -17,6 +17,11 @@ $(eval $(call gb_Library_set_include,chartopengl,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_externals,chartopengl,\ + boost_headers \ + mdds_headers \ +)) + $(eval $(call gb_Library_use_sdk_api,chartopengl)) $(eval $(call gb_Library_use_externals,chartopengl,\ @@ -33,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,chartopengl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_set_precompiled_header,chartopengl,$(SRCDIR)/chart2/inc/pch/precompiled_chartopengl)) - $(eval $(call gb_Library_add_exception_objects,chartopengl,\ chart2/source/glew/glew \ chart2/source/view/main/OpenglShapeFactory \ diff --git a/chart2/inc/pch/precompiled_chartopengl.cxx b/chart2/inc/pch/precompiled_chartopengl.cxx new file mode 100755 index 000000000000..f05ecffa74e0 --- /dev/null +++ b/chart2/inc/pch/precompiled_chartopengl.cxx @@ -0,0 +1,18 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +/* + This file has been autogenerated by update_pch.sh . It is possible to edit it + manually (such as when an include file has been moved/renamed/removed. All such + manual changes will be rewritten by the next run of update_pch.sh (which presumably + also fixes all possible problems, so it's usually better to use it). +*/ + + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/inc/pch/precompiled_chartopengl.hxx b/chart2/inc/pch/precompiled_chartopengl.hxx new file mode 100755 index 000000000000..8446c33a9eda --- /dev/null +++ b/chart2/inc/pch/precompiled_chartopengl.hxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#include "precompiled_chartopengl.cxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx index e535a25c79b1..2f4b6cfd625b 100644 --- a/chart2/source/view/main/OpenglShapeFactory.cxx +++ b/chart2/source/view/main/OpenglShapeFactory.cxx @@ -59,7 +59,7 @@ using ::com::sun::star::uno::Reference; namespace chart { -SAL_CALL extern "C" { +extern "C" { SAL_DLLPUBLIC_EXPORT opengl::OpenglShapeFactory* getOpenglShapeFactory() { |