diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
| commit | 1fb042333fe6287756ff1fac11d18cd7c150730d (patch) | |
| tree | 595de5d187177832ce656d7832af9dce9dce2d99 /framework/Library_fwe.mk | |
| parent | 5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff) | |
| parent | cd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff) | |
rebase to DEV300_m100
Diffstat (limited to 'framework/Library_fwe.mk')
| -rw-r--r-- | framework/Library_fwe.mk | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 33d8959a474e..5d30d108cde6 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\ utl \ vcl \ vos3 \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,fwe,\ @@ -77,8 +78,8 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/helper/imageproducer \ framework/source/fwe/helper/propertysetcontainer \ framework/source/fwe/helper/titlehelper \ - framework/source/fwe/helper/uiconfigelementwrapperbase \ - framework/source/fwe/helper/uielementwrapperbase \ + framework/source/fwe/helper/documentundoguard \ + framework/source/fwe/helper/undomanagerhelper \ framework/source/fwe/interaction/preventduplicateinteraction \ framework/source/fwe/xml/eventsconfiguration \ framework/source/fwe/xml/eventsdocumenthandler \ @@ -94,22 +95,9 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/xml/xmlnamespaces \ )) +#todo: ImageListDescriptor can't be exported completely without exporting everything ifeq ($(OS),LINUX) - $(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS)))) - -$(eval $(call gb_Library_add_linked_libs,fwe,\ - dl \ - m \ - pthread \ -)) endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,fwe,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) -endif -# TODO: visibility + # vim: set noet sw=4 ts=4: |