Moved common/scaler* to graphics/

svn-id: r20797
onlyjob · Feb 20, 2006 · 7335d34 · 7335d34
1 parent 6160a17
commit 7335d34
Show file tree

Hide file tree

Showing 24 changed files with 38 additions and 40 deletions.
diff --git a/TODO b/TODO
@@ -112,9 +112,6 @@ General
   reachable :-)
 * Some source files should be moved. But that's a pain with CVS, so let's
   wait until we switch to something better, like Subversion. In particular:
-  - common/scaler* stuff should either be moved to graphics/, or maybe
-    to backends/ (while it is portable code, it's something to be used by
-    the backends only)
   - consider moving the MIDI stuff from sound/ to sound/midi/ 
   - move fmopl code to softsynth dir
   - move fonts to graphics/fonts/ dir

diff --git a/backends/sdl/graphics.cpp b/backends/sdl/graphics.cpp
@@ -22,10 +22,10 @@
  */
 
 #include "backends/sdl/sdl-common.h"
-#include "common/scaler.h"
 #include "common/util.h"
 #include "graphics/font.h"
 #include "graphics/fontman.h"
+#include "graphics/scaler.h"
 #include "graphics/surface.h"
 
 static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {

diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h
@@ -26,8 +26,8 @@
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"
-#include "common/scaler.h"
 #include "common/system.h"
+#include "graphics/scaler.h"
 #include "backends/intern.h"
 
 #include <SDL.h>

diff --git a/common/module.mk b/common/module.mk
@@ -12,36 +12,10 @@ MODULE_OBJS := \
 	util.o \
 	savefile.o \
 	system.o \
-	scaler.o \
-	scaler/thumbnail.o \
 	unzip.o
 
-ifndef DISABLE_SCALERS
-MODULE_OBJS += \
-	scaler/2xsai.o \
-	scaler/aspect.o \
-	scaler/scale2x.o \
-	scaler/scale3x.o \
-	scaler/scalebit.o
-
-ifndef DISABLE_HQ_SCALERS
-MODULE_OBJS += \
-	scaler/hq2x.o \
-	scaler/hq3x.o
-
-ifdef HAVE_NASM
-MODULE_OBJS += \
-	scaler/hq2x_i386.o \
-	scaler/hq3x_i386.o
-endif
-
-endif
-
-endif
-
 MODULE_DIRS += \
-	common \
-	common/scaler
+	common
 
 # Include common rules 
 include $(srcdir)/common.rules
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
@@ -24,7 +24,8 @@
 #include "common/config-manager.h"
 #include "common/savefile.h"
 #include "common/system.h"
-#include "common/scaler.h"
+
+#include "graphics/scaler.h"
 
 #include "gui/about.h"
 #include "gui/chooser.h"

diff --git a/graphics/module.mk b/graphics/module.mk
@@ -6,16 +6,42 @@ MODULE_OBJS := \
 	font.o \
 	fontman.o \
 	ilbm.o \
-	newfont.o \
+	imagedec.o \
+	imageman.o \
 	newfont_big.o \
+	newfont.o \
 	primitives.o \
+	scaler.o \
+	scaler/thumbnail.o \
 	scummfont.o \
-	surface.o \
-	imageman.o \
-	imagedec.o
+	surface.o
+
+ifndef DISABLE_SCALERS
+MODULE_OBJS += \
+	scaler/2xsai.o \
+	scaler/aspect.o \
+	scaler/scale2x.o \
+	scaler/scale3x.o \
+	scaler/scalebit.o
+
+ifndef DISABLE_HQ_SCALERS
+MODULE_OBJS += \
+	scaler/hq2x.o \
+	scaler/hq3x.o
+
+ifdef HAVE_NASM
+MODULE_OBJS += \
+	scaler/hq2x_i386.o \
+	scaler/hq3x_i386.o
+endif
+
+endif
+
+endif
 
 MODULE_DIRS += \
-	graphics
+	graphics \
+	graphics/scaler
 
 # Include common rules 
 include $(srcdir)/common.rules
diff --git a/common/scaler.cpp → graphics/scaler.cpp b/common/scaler.cpp → graphics/scaler.cpp
@@ -21,8 +21,8 @@
  *
  */
 
-#include "common/scaler/intern.h"
-#include "common/scaler/scalebit.h"
+#include "graphics/scaler/intern.h"
+#include "graphics/scaler/scalebit.h"
 #include "common/util.h"
 
 

diff --git a/common/scaler.h → graphics/scaler.h b/common/scaler.h → graphics/scaler.h
diff --git a/common/scaler/2xsai.cpp → graphics/scaler/2xsai.cpp b/common/scaler/2xsai.cpp → graphics/scaler/2xsai.cpp
diff --git a/common/scaler/aspect.cpp → graphics/scaler/aspect.cpp b/common/scaler/aspect.cpp → graphics/scaler/aspect.cpp
diff --git a/common/scaler/hq2x.cpp → graphics/scaler/hq2x.cpp b/common/scaler/hq2x.cpp → graphics/scaler/hq2x.cpp
diff --git a/common/scaler/hq2x.h → graphics/scaler/hq2x.h b/common/scaler/hq2x.h → graphics/scaler/hq2x.h
diff --git a/common/scaler/hq2x_i386.asm → graphics/scaler/hq2x_i386.asm b/common/scaler/hq2x_i386.asm → graphics/scaler/hq2x_i386.asm
diff --git a/common/scaler/hq3x.cpp → graphics/scaler/hq3x.cpp b/common/scaler/hq3x.cpp → graphics/scaler/hq3x.cpp
diff --git a/common/scaler/hq3x.h → graphics/scaler/hq3x.h b/common/scaler/hq3x.h → graphics/scaler/hq3x.h
diff --git a/common/scaler/hq3x_i386.asm → graphics/scaler/hq3x_i386.asm b/common/scaler/hq3x_i386.asm → graphics/scaler/hq3x_i386.asm
diff --git a/common/scaler/intern.h → graphics/scaler/intern.h b/common/scaler/intern.h → graphics/scaler/intern.h
diff --git a/common/scaler/scale2x.cpp → graphics/scaler/scale2x.cpp b/common/scaler/scale2x.cpp → graphics/scaler/scale2x.cpp
diff --git a/common/scaler/scale2x.h → graphics/scaler/scale2x.h b/common/scaler/scale2x.h → graphics/scaler/scale2x.h
diff --git a/common/scaler/scale3x.cpp → graphics/scaler/scale3x.cpp b/common/scaler/scale3x.cpp → graphics/scaler/scale3x.cpp
diff --git a/common/scaler/scale3x.h → graphics/scaler/scale3x.h b/common/scaler/scale3x.h → graphics/scaler/scale3x.h
diff --git a/common/scaler/scalebit.cpp → graphics/scaler/scalebit.cpp b/common/scaler/scalebit.cpp → graphics/scaler/scalebit.cpp
diff --git a/common/scaler/scalebit.h → graphics/scaler/scalebit.h b/common/scaler/scalebit.h → graphics/scaler/scalebit.h
diff --git a/common/scaler/thumbnail.cpp → graphics/scaler/thumbnail.cpp b/common/scaler/thumbnail.cpp → graphics/scaler/thumbnail.cpp