aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/module.mk9
-rw-r--r--graphics/scaler.h4
2 files changed, 8 insertions, 5 deletions
diff --git a/graphics/module.mk b/graphics/module.mk
index 15fbf092b3..85a1afe3a8 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -48,7 +48,14 @@ 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
@@ -61,7 +68,5 @@ endif
endif
-endif
-
# Include common rules
include $(srcdir)/rules.mk
diff --git a/graphics/scaler.h b/graphics/scaler.h
index 22bda5273a..1ee1503967 100644
--- a/graphics/scaler.h
+++ b/graphics/scaler.h
@@ -42,7 +42,6 @@ typedef void ScalerProc(const uint8 *srcPtr, uint32 srcPitch,
DECLARE_SCALER(Normal1x);
#ifdef USE_SCALERS
-
DECLARE_SCALER(Normal2x);
DECLARE_SCALER(Normal3x);
DECLARE_SCALER(Normal1o5x);
@@ -56,14 +55,13 @@ 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