diff options
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | graphics/animation.cpp | 2 | ||||
| -rw-r--r-- | graphics/fonts/consolefont.cpp (renamed from graphics/consolefont.cpp) | 0 | ||||
| -rw-r--r-- | graphics/fonts/newfont.cpp (renamed from graphics/newfont.cpp) | 0 | ||||
| -rw-r--r-- | graphics/fonts/newfont_big.cpp (renamed from graphics/newfont_big.cpp) | 0 | ||||
| -rw-r--r-- | graphics/fonts/scummfont.cpp (renamed from graphics/scummfont.cpp) | 0 | ||||
| -rw-r--r-- | graphics/module.mk | 9 |
7 files changed, 6 insertions, 6 deletions
@@ -114,7 +114,6 @@ General wait until we switch to something better, like Subversion. In particular: - consider moving the MIDI stuff from sound/ to sound/midi/ - move fmopl code to softsynth dir - - move fonts to graphics/fonts/ dir - maybe common/system.h / system.cpp should go to backends/, too ? - move the iMuse source files in scumm/ to a new dir scumm/imuse/ * The following things should be put into namespaces: diff --git a/graphics/animation.cpp b/graphics/animation.cpp index baf52465d5..3c0d0bab83 100644 --- a/graphics/animation.cpp +++ b/graphics/animation.cpp @@ -27,7 +27,7 @@ #include "common/file.h" #include "common/system.h" #include "common/util.h" -#include "common/scaler/intern.h" +#include "graphics/scaler/intern.h" namespace Graphics { diff --git a/graphics/consolefont.cpp b/graphics/fonts/consolefont.cpp index 5c95c4bb42..5c95c4bb42 100644 --- a/graphics/consolefont.cpp +++ b/graphics/fonts/consolefont.cpp diff --git a/graphics/newfont.cpp b/graphics/fonts/newfont.cpp index c9d32fb044..c9d32fb044 100644 --- a/graphics/newfont.cpp +++ b/graphics/fonts/newfont.cpp diff --git a/graphics/newfont_big.cpp b/graphics/fonts/newfont_big.cpp index f7a18469c0..f7a18469c0 100644 --- a/graphics/newfont_big.cpp +++ b/graphics/fonts/newfont_big.cpp diff --git a/graphics/scummfont.cpp b/graphics/fonts/scummfont.cpp index c6dc570486..c6dc570486 100644 --- a/graphics/scummfont.cpp +++ b/graphics/fonts/scummfont.cpp diff --git a/graphics/module.mk b/graphics/module.mk index 7ded354cdb..89b32fac19 100644 --- a/graphics/module.mk +++ b/graphics/module.mk @@ -2,18 +2,18 @@ MODULE := graphics MODULE_OBJS := \ animation.o \ - consolefont.o \ font.o \ fontman.o \ + fonts/consolefont.o \ + fonts/newfont_big.o \ + fonts/newfont.o \ + fonts/scummfont.o \ ilbm.o \ imagedec.o \ imageman.o \ - newfont_big.o \ - newfont.o \ primitives.o \ scaler.o \ scaler/thumbnail.o \ - scummfont.o \ surface.o ifndef DISABLE_SCALERS @@ -41,6 +41,7 @@ endif MODULE_DIRS += \ graphics \ + graphics/fonts \ graphics/scaler # Include common rules |