diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-14 23:00:48 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-14 23:00:48 +0100 |
| commit | 2b7675c9b0b3fe6accea195d6f009706c0d114ad (patch) | |
| tree | d8004c2ba451a30a234d19c6978530d923d37e88 /svtools/Library_svt.mk | |
| parent | ac2741f0361ea516ffe8ead57a6e43665ec99937 (diff) | |
| parent | ce5f1dd187c3a7d8113c7653fa887b98fd50aaf6 (diff) | |
gridsort: pulled and merged DEV300_m100
Diffstat (limited to 'svtools/Library_svt.mk')
| -rw-r--r-- | svtools/Library_svt.mk | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 437323083795..01bc05ebaeca 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.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. # @@ -70,6 +70,7 @@ $(eval $(call gb_Library_add_linked_libs,svt,\ utl \ vcl \ vos3 \ + $(gb_STDLIBS) \ )) ifeq ($(SYSTEM_JPEG),YES) @@ -293,46 +294,14 @@ $(eval $(call gb_Library_add_cobjects,svt,\ svtools/source/filter.vcl/jpeg/jpegc \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,svt,\ - dl \ - m \ - pthread \ -)) -endif - ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,svt,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - advapi32 \ - gdi32 \ - kernel32 \ - msvcrt \ - ole32 \ - oleaut32 \ - user32 \ - uuid \ -)) -else $(eval $(call gb_Library_add_linked_libs,svt,\ advapi32 \ gdi32 \ - kernel32 \ - msvcrt \ - oldnames \ ole32 \ oleaut32 \ user32 \ uuid \ - uwinapi \ )) endif -endif # vim: set noet sw=4 ts=4: |