From be0885e9d1edd6963a3060a41fa3b705c84c41f1 Mon Sep 17 00:00:00 2001
From: Andre Heider
Date: Mon, 10 May 2010 17:25:12 +0000
Subject: Revert r48979. Instead, make the HQ scalers depend on the normal
 ones. Configure reflects that now.

svn-id: r48996
---
 graphics/module.mk | 9 ++-------
 graphics/scaler.h  | 4 +++-
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'graphics')

diff --git a/graphics/module.mk b/graphics/module.mk
index 85a1afe3a8..15fbf092b3 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -48,14 +48,7 @@ MODULE_OBJS += \
 	scaler/Normal2xARM.o
 endif
 
-endif
-
 ifdef USE_HQ_SCALERS
-ifndef USE_SCALERS
-MODULE_OBJS += \
-	scaler/aspect.o
-endif
-
 MODULE_OBJS += \
 	scaler/hq2x.o \
 	scaler/hq3x.o
@@ -68,5 +61,7 @@ endif
 
 endif
 
+endif
+
 # Include common rules
 include $(srcdir)/rules.mk
diff --git a/graphics/scaler.h b/graphics/scaler.h
index 1ee1503967..22bda5273a 100644
--- a/graphics/scaler.h
+++ b/graphics/scaler.h
@@ -42,6 +42,7 @@ typedef void ScalerProc(const uint8 *srcPtr, uint32 srcPitch,
 DECLARE_SCALER(Normal1x);
 
 #ifdef USE_SCALERS
+
 DECLARE_SCALER(Normal2x);
 DECLARE_SCALER(Normal3x);
 DECLARE_SCALER(Normal1o5x);
@@ -55,13 +56,14 @@ DECLARE_SCALER(AdvMame3x);
 
 DECLARE_SCALER(TV2x);
 DECLARE_SCALER(DotMatrix);
-#endif // #ifdef USE_SCALERS
 
 #ifdef USE_HQ_SCALERS
 DECLARE_SCALER(HQ2x);
 DECLARE_SCALER(HQ3x);
 #endif
 
+#endif // #ifdef USE_SCALERS
+
 // creates a 160x100 thumbnail for 320x200 games
 // and 160x120 thumbnail for 320x240 and 640x480 games
 // only 565 mode
-- 
cgit v1.2.3