diff options
Diffstat (limited to 'sw/Library_swui.mk')
| -rw-r--r-- | sw/Library_swui.mk | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 12227c9a0ae8..f7b3f529c80f 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.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. # @@ -36,13 +36,11 @@ $(eval $(call gb_Library_set_include,swui,\ -I$(WORKDIR)/SdiTarget/sw/sdi \ -I$(WORKDIR)/Misc/sw \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/sw \ -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,swui,\ $$(DEFS) \ - -DACCESSIBLE_LAYOUT \ )) $(eval $(call gb_Library_add_linked_libs,swui,\ @@ -67,6 +65,7 @@ $(eval $(call gb_Library_add_linked_libs,swui,\ ucbhelper \ utl \ vcl \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,swui,\ @@ -166,14 +165,4 @@ $(eval $(call gb_Library_add_exception_objects,swui,\ sw/source/ui/utlui/swrenamexnameddlg \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,swui,\ - advapi32 \ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif # vim: set noet sw=4 ts=4: |