diff options
Diffstat (limited to 'svtools/Executable_bmp.mk')
| -rw-r--r-- | svtools/Executable_bmp.mk | 38 |
1 files changed, 4 insertions, 34 deletions
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk index 67b21600e523..115665ed0d18 100644 --- a/svtools/Executable_bmp.mk +++ b/svtools/Executable_bmp.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. # @@ -45,6 +45,7 @@ $(eval $(call gb_Executable_add_linked_libs,bmp,\ tl \ vcl \ vos3 \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Executable_add_exception_objects,bmp,\ @@ -52,35 +53,4 @@ $(eval $(call gb_Executable_add_exception_objects,bmp,\ svtools/bmpmaker/bmpcore \ )) -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Executable_add_linked_libs,bmp,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else -$(eval $(call gb_Executable_add_linked_libs,bmp,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,bmp,\ - dl \ - pthread \ -)) -endif # vim: set noet sw=4 ts=4: |