aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.common4
-rw-r--r--common/scaler.cpp (renamed from scumm/scaler.cpp)0
-rw-r--r--common/scaler.h (renamed from scumm/scaler.h)0
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.common b/Makefile.common
index 96fb846bf4..224c8a3584 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -10,7 +10,7 @@ ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
INCS = scumm/scumm.h common/scummsys.h common/stdafx.h
COMMON_OBJS = common/config-file.o common/engine.o common/gameDetector.o \
- common/main.o common/timer.o common/util.o
+ common/main.o common/timer.o common/util.o common/scaler.o
GUI_OBJS = gui/gui.o gui/newgui.o gui/widget.o gui/dialog.o gui/ListWidget.o \
gui/ScrollBarWidget.o
@@ -18,7 +18,7 @@ GUI_OBJS = gui/gui.o gui/newgui.o gui/widget.o gui/dialog.o gui/ListWidget.o \
SCUMM_OBJS = scumm/actor.o scumm/akos.o scumm/boxes.o scumm/bundle.o \
scumm/costume.o scumm/debug.o scumm/debugrl.o scumm/gfx.o scumm/imuse.o \
scumm/insane.o scumm/object.o scumm/resource.o scumm/resource_v3.o \
- scumm/resource_v4.o scumm/saveload.o scumm/scaler.o scumm/script.o \
+ scumm/resource_v4.o scumm/saveload.o scumm/script.o \
scumm/script_v1.o scumm/script_v2.o scumm/scummvm.o scumm/string.o \
scumm/sys.o scumm/vars.o scumm/verbs.o
diff --git a/scumm/scaler.cpp b/common/scaler.cpp
index 3f6b3b9f09..3f6b3b9f09 100644
--- a/scumm/scaler.cpp
+++ b/common/scaler.cpp
diff --git a/scumm/scaler.h b/common/scaler.h
index f3675ccdce..f3675ccdce 100644
--- a/scumm/scaler.h
+++ b/common/scaler.h