[Scummvm-cvs-logs] CVS: scummvm/common module.mk,1.22,1.23 scaler.cpp,1.71,1.72

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19154/common

Modified Files:
	module.mk scaler.cpp 
Log Message:
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.


Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/module.mk,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- module.mk	14 May 2005 22:56:37 -0000	1.22
+++ module.mk	20 Sep 2005 18:16:09 -0000	1.23
@@ -11,17 +11,17 @@
 	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 += \

Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- scaler.cpp	30 Jul 2005 21:10:57 -0000	1.71
+++ scaler.cpp	20 Sep 2005 18:16:09 -0000	1.72
@@ -147,6 +147,7 @@
 	}
 }
 
+#ifndef DISABLE_SCALERS
 /**
  * Trivial nearest-neighbour 2x scaler.
  */
@@ -316,3 +317,5 @@
 		q += nextlineDst << 1;
 	}
 }
+
+#endif