diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:47:55 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:47:55 +0000 |
| commit | bcd85274626695b2c07580c0f03e4b862d5b45c0 (patch) | |
| tree | 9bec8f99d56d35d3d044da9de23cfcfe322d4e69 /basebmp | |
| parent | a2eff6fb3c10acf259df5da73d1c095321fcb5f4 (diff) | |
INTEGRATION: CWS sb59 (1.5.4); FILE MERGED
2006/09/01 08:34:02 sb 1.5.4.3: #i67535# Made code warning-free (GCC 4.0.3).
2006/08/31 11:08:52 thb 1.5.4.2: #i69122# msvc has no working llabs
2006/08/30 22:52:04 thb 1.5.4.1: #i69122# Made basebmp compile warning-free
Diffstat (limited to 'basebmp')
| -rw-r--r-- | basebmp/source/makefile.mk | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/basebmp/source/makefile.mk b/basebmp/source/makefile.mk index 30d8433b363b..96c7b8483b82 100644 --- a/basebmp/source/makefile.mk +++ b/basebmp/source/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: thb $ $Date: 2006-07-27 11:35:31 $ +# last change: $Author: obo $ $Date: 2006-10-12 13:47:55 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -43,8 +43,22 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk + +# TODO(F3) unify BASEBMP_NO_NESTED_TEMPLATE_PARAMETER and +# VIGRA_WITHOUT_NESTED_TEMPLATES_PARAMS +# +# - VIGRA_WITHOUT_NESTED_TEMPLATES_PARAMS avoids template parameters +# to templates - the template keyword is broken for SunCC +# - VIGRA_HAS_LONG_LONG enables long long overloads (but appears to not work +# reliably in some environments, and is thus not enabled) +# - VIGRA_HAS_LONG_DOUBLE enables long double overloads + +.IF "$(OS)"!="WNT" +CDEFS+= -DVIGRA_HAS_LONG_DOUBLE +.ENDIF + .IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC" -CDEFS+= -DBASEBMP_NO_NESTED_TEMPLATE_PARAMETER +CDEFS+= -DBASEBMP_NO_NESTED_TEMPLATE_PARAMETER -DVIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS .ENDIF # --- Common ---------------------------------------------------------- |