aboutsummaryrefslogtreecommitdiff
path: root/graphics/module.mk
diff options
context:
space:
mode:
authorAndre Heider2010-05-10 17:25:12 +0000
committerAndre Heider2010-05-10 17:25:12 +0000
commitbe0885e9d1edd6963a3060a41fa3b705c84c41f1 (patch)
tree1c4c44325ee66e9da29062f4a86c2e330b00d9aa /graphics/module.mk
parentcdf30ecc5acf689a44156b7afdab7571d519d220 (diff)
downloadscummvm-rg350-be0885e9d1edd6963a3060a41fa3b705c84c41f1.tar.gz
scummvm-rg350-be0885e9d1edd6963a3060a41fa3b705c84c41f1.tar.bz2
scummvm-rg350-be0885e9d1edd6963a3060a41fa3b705c84c41f1.zip
Revert r48979. Instead, make the HQ scalers depend on the normal ones. Configure reflects that now.
svn-id: r48996
Diffstat (limited to 'graphics/module.mk')
-rw-r--r--graphics/module.mk9
1 files changed, 2 insertions, 7 deletions
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