diff options
Diffstat (limited to 'sw/Library_swd.mk')
| -rw-r--r-- | sw/Library_swd.mk | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 17511d3bf4ed..a0dcfaf29c3a 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.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. # @@ -38,13 +38,11 @@ $(eval $(call gb_Library_set_include,swd,\ -I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/source/filter/inc \ -I$(SRCDIR)/sw/source/ui/inc \ - -I$(OUTDIR)/inc/sw \ -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,swd,\ $$(DEFS) \ - -DACCESSIBLE_LAYOUT \ )) $(eval $(call gb_Library_add_linked_libs,swd,\ @@ -60,6 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,swd,\ ucbhelper \ utl \ vcl \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,swd,\ @@ -69,11 +68,5 @@ $(eval $(call gb_Library_add_exception_objects,swd,\ sw/source/ui/uno/swdet2 \ sw/source/ui/uno/swdetect \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,swd,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) -endif + # vim: set noet sw=4 ts=4: |