diff options
| author | Eugene Sandulenko | 2005-09-20 18:16:09 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-09-20 18:16:09 +0000 |
| commit | aa33153569afda655b988a4c9a1efee261ca107e (patch) | |
| tree | 7a9cbf46280a62bc8c582fa77e9939d4d8f883e6 /common | |
| parent | a0cff37f0697cd0082ca5fabac38159b265f4471 (diff) | |
| download | scummvm-rg350-aa33153569afda655b988a4c9a1efee261ca107e.tar.gz scummvm-rg350-aa33153569afda655b988a4c9a1efee261ca107e.tar.bz2 scummvm-rg350-aa33153569afda655b988a4c9a1efee261ca107e.zip | |
Normalize use of DISABLE_SCALERS. Now it really disables all scalers
except essential Normal1x. Also thumbnails get compiled unconditionally
so we get them on all platforms, even those which never display them.
Sorted out mess brought to sdl backend by epoc maintainer. He misused
__SYMBIAN32__ where DISABLE_SCALERS is more appropriate.
svn-id: r18850
Diffstat (limited to 'common')
| -rw-r--r-- | common/module.mk | 8 | ||||
| -rw-r--r-- | common/scaler.cpp | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/common/module.mk b/common/module.mk index 9d455e153a..7fd5396457 100644 --- a/common/module.mk +++ b/common/module.mk @@ -11,17 +11,17 @@ MODULE_OBJS := \ common/timer.o \ common/util.o \ common/savefile.o \ - common/system.o + common/system.o \ + common/scaler.o \ + common/scaler/thumbnail.o ifndef DISABLE_SCALERS MODULE_OBJS += \ - common/scaler.o \ common/scaler/2xsai.o \ common/scaler/aspect.o \ common/scaler/scale2x.o \ common/scaler/scale3x.o \ - common/scaler/scalebit.o \ - common/scaler/thumbnail.o + common/scaler/scalebit.o ifndef DISABLE_HQ_SCALERS MODULE_OBJS += \ diff --git a/common/scaler.cpp b/common/scaler.cpp index 4b30b1b9b1..1a4c77fd05 100644 --- a/common/scaler.cpp +++ b/common/scaler.cpp @@ -147,6 +147,7 @@ void Normal1x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit } } +#ifndef DISABLE_SCALERS /** * Trivial nearest-neighbour 2x scaler. */ @@ -316,3 +317,5 @@ void DotMatrix(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPi q += nextlineDst << 1; } } + +#endif |