diff options
| author | Andre Heider | 2010-05-09 11:00:17 +0000 |
|---|---|---|
| committer | Andre Heider | 2010-05-09 11:00:17 +0000 |
| commit | a3e428f6dbfd39c14495909b5e748d8581e3ad2b (patch) | |
| tree | a8385d0bdfc21d8a3a279a12e85aab920e266ef1 /graphics | |
| parent | cff786341f22352066da235a288b876c3c2b1612 (diff) | |
| download | scummvm-rg350-a3e428f6dbfd39c14495909b5e748d8581e3ad2b.tar.gz scummvm-rg350-a3e428f6dbfd39c14495909b5e748d8581e3ad2b.tar.bz2 scummvm-rg350-a3e428f6dbfd39c14495909b5e748d8581e3ad2b.zip | |
Rename DISABLE_*SCALERS to USE_*SCALERS, and move the mk/cpp defines to configure.
svn-id: r48977
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/module.mk | 4 | ||||
| -rw-r--r-- | graphics/scaler.cpp | 10 | ||||
| -rw-r--r-- | graphics/scaler.h | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/graphics/module.mk b/graphics/module.mk index fde78b130a..15fbf092b3 100644 --- a/graphics/module.mk +++ b/graphics/module.mk @@ -32,7 +32,7 @@ MODULE_OBJS := \ video/coktelvideo/indeo3.o \ video/coktelvideo/coktelvideo.o -ifndef DISABLE_SCALERS +ifdef USE_SCALERS MODULE_OBJS += \ scaler/2xsai.o \ scaler/aspect.o \ @@ -48,7 +48,7 @@ MODULE_OBJS += \ scaler/Normal2xARM.o endif -ifndef DISABLE_HQ_SCALERS +ifdef USE_HQ_SCALERS MODULE_OBJS += \ scaler/hq2x.o \ scaler/hq3x.o diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp index a1439d3165..304d194a1a 100644 --- a/graphics/scaler.cpp +++ b/graphics/scaler.cpp @@ -30,7 +30,7 @@ int gBitFormat = 565; -#ifndef DISABLE_HQ_SCALERS +#ifdef USE_HQ_SCALERS // RGB-to-YUV lookup table extern "C" { @@ -139,7 +139,7 @@ void InitScalers(uint32 BitFormat) { format = g_system->getOverlayFormat(); } -#ifndef DISABLE_HQ_SCALERS +#ifdef USE_HQ_SCALERS InitLUT(format); #endif @@ -152,7 +152,7 @@ void InitScalers(uint32 BitFormat) { } void DestroyScalers(){ -#ifndef DISABLE_HQ_SCALERS +#ifdef USE_HQ_SCALERS free(RGBtoYUV); RGBtoYUV = 0; #endif @@ -177,7 +177,7 @@ void Normal1x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit } } -#ifndef DISABLE_SCALERS +#ifdef USE_SCALERS #ifdef USE_ARM_SCALER_ASM @@ -386,4 +386,4 @@ void DotMatrix(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPi } } -#endif // #ifndef DISABLE_SCALERS +#endif // #ifdef USE_SCALERS diff --git a/graphics/scaler.h b/graphics/scaler.h index f00226cab9..22bda5273a 100644 --- a/graphics/scaler.h +++ b/graphics/scaler.h @@ -41,7 +41,7 @@ typedef void ScalerProc(const uint8 *srcPtr, uint32 srcPitch, DECLARE_SCALER(Normal1x); -#ifndef DISABLE_SCALERS +#ifdef USE_SCALERS DECLARE_SCALER(Normal2x); DECLARE_SCALER(Normal3x); @@ -57,12 +57,12 @@ DECLARE_SCALER(AdvMame3x); DECLARE_SCALER(TV2x); DECLARE_SCALER(DotMatrix); -#ifndef DISABLE_HQ_SCALERS +#ifdef USE_HQ_SCALERS DECLARE_SCALER(HQ2x); DECLARE_SCALER(HQ3x); #endif -#endif // #ifndef DISABLE_SCALERS +#endif // #ifdef USE_SCALERS // creates a 160x100 thumbnail for 320x200 games // and 160x120 thumbnail for 320x240 and 640x480 games |