diff options
| -rw-r--r-- | sword2/_mouse.cpp (renamed from sword2/driver/_mouse.cpp) | 0 | ||||
| -rw-r--r-- | sword2/animation.cpp (renamed from sword2/driver/animation.cpp) | 2 | ||||
| -rw-r--r-- | sword2/animation.h (renamed from sword2/driver/animation.h) | 0 | ||||
| -rw-r--r-- | sword2/anims.cpp | 2 | ||||
| -rw-r--r-- | sword2/d_draw.cpp (renamed from sword2/driver/d_draw.cpp) | 0 | ||||
| -rw-r--r-- | sword2/function.cpp | 2 | ||||
| -rw-r--r-- | sword2/menu.cpp (renamed from sword2/driver/menu.cpp) | 0 | ||||
| -rw-r--r-- | sword2/module.mk | 23 | ||||
| -rw-r--r-- | sword2/music.cpp (renamed from sword2/driver/d_sound.cpp) | 0 | ||||
| -rw-r--r-- | sword2/palette.cpp (renamed from sword2/driver/palette.cpp) | 0 | ||||
| -rw-r--r-- | sword2/rdwin.cpp (renamed from sword2/driver/rdwin.cpp) | 0 | ||||
| -rw-r--r-- | sword2/render.cpp (renamed from sword2/driver/render.cpp) | 2 | ||||
| -rw-r--r-- | sword2/sprite.cpp (renamed from sword2/driver/sprite.cpp) | 0 |
13 files changed, 15 insertions, 16 deletions
diff --git a/sword2/driver/_mouse.cpp b/sword2/_mouse.cpp index db0cf00f73..db0cf00f73 100644 --- a/sword2/driver/_mouse.cpp +++ b/sword2/_mouse.cpp diff --git a/sword2/driver/animation.cpp b/sword2/animation.cpp index 0b5adb6a9c..2ba5df6792 100644 --- a/sword2/driver/animation.cpp +++ b/sword2/animation.cpp @@ -31,7 +31,7 @@ #include "sword2/maketext.h" #include "sword2/resman.h" #include "sword2/sound.h" -#include "sword2/driver/animation.h" +#include "sword2/animation.h" namespace Sword2 { diff --git a/sword2/driver/animation.h b/sword2/animation.h index a65d526bfd..a65d526bfd 100644 --- a/sword2/driver/animation.h +++ b/sword2/animation.h diff --git a/sword2/anims.cpp b/sword2/anims.cpp index 3390b7ab49..e64903a61f 100644 --- a/sword2/anims.cpp +++ b/sword2/anims.cpp @@ -37,7 +37,7 @@ #include "sword2/resman.h" #include "sword2/router.h" #include "sword2/sound.h" -#include "sword2/driver/animation.h" +#include "sword2/animation.h" namespace Sword2 { diff --git a/sword2/driver/d_draw.cpp b/sword2/d_draw.cpp index 7f278996fb..7f278996fb 100644 --- a/sword2/driver/d_draw.cpp +++ b/sword2/d_draw.cpp diff --git a/sword2/function.cpp b/sword2/function.cpp index 705ec9dde0..e749e7b497 100644 --- a/sword2/function.cpp +++ b/sword2/function.cpp @@ -34,7 +34,7 @@ #include "sword2/resman.h" #include "sword2/router.h" #include "sword2/sound.h" -#include "sword2/driver/animation.h" +#include "sword2/animation.h" namespace Sword2 { diff --git a/sword2/driver/menu.cpp b/sword2/menu.cpp index 07e00accb6..07e00accb6 100644 --- a/sword2/driver/menu.cpp +++ b/sword2/menu.cpp diff --git a/sword2/module.mk b/sword2/module.mk index c697ae04d3..fb020ba633 100644 --- a/sword2/module.mk +++ b/sword2/module.mk @@ -1,10 +1,13 @@ MODULE := sword2 MODULE_OBJS := \ + sword2/_mouse.o \ + sword2/animation.o \ sword2/anims.o \ sword2/build_display.o \ sword2/console.o \ sword2/controls.o \ + sword2/d_draw.o \ sword2/debug.o \ sword2/events.o \ sword2/function.o \ @@ -14,31 +17,27 @@ MODULE_OBJS := \ sword2/logic.o \ sword2/maketext.o \ sword2/memory.o \ + sword2/menu.o \ sword2/mouse.o \ + sword2/music.o \ + sword2/palette.o \ sword2/protocol.o \ + sword2/rdwin.o \ + sword2/render.o \ sword2/resman.o \ sword2/router.o \ sword2/save_rest.o \ sword2/scroll.o \ sword2/sound.o \ sword2/speech.o \ + sword2/sprite.o \ sword2/startup.o \ sword2/sword2.o \ sword2/sync.o \ - sword2/walker.o \ - sword2/driver/d_draw.o \ - sword2/driver/d_sound.o \ - sword2/driver/menu.o \ - sword2/driver/_mouse.o \ - sword2/driver/palette.o \ - sword2/driver/rdwin.o \ - sword2/driver/render.o \ - sword2/driver/sprite.o \ - sword2/driver/animation.o + sword2/walker.o MODULE_DIRS += \ - sword2 \ - sword2/driver + sword2 # This module can be built as a plugin ifdef BUILD_PLUGINS diff --git a/sword2/driver/d_sound.cpp b/sword2/music.cpp index 847f4808cf..847f4808cf 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/music.cpp diff --git a/sword2/driver/palette.cpp b/sword2/palette.cpp index 0b6b7a8ca2..0b6b7a8ca2 100644 --- a/sword2/driver/palette.cpp +++ b/sword2/palette.cpp diff --git a/sword2/driver/rdwin.cpp b/sword2/rdwin.cpp index 310b66abf7..310b66abf7 100644 --- a/sword2/driver/rdwin.cpp +++ b/sword2/rdwin.cpp diff --git a/sword2/driver/render.cpp b/sword2/render.cpp index 0a455bc671..da60ecd6d9 100644 --- a/sword2/driver/render.cpp +++ b/sword2/render.cpp @@ -29,7 +29,7 @@ #include "sword2/build_display.h" #ifdef BACKEND_8BIT -#include "sword2/driver/animation.h" +#include "sword2/animation.h" #endif namespace Sword2 { diff --git a/sword2/driver/sprite.cpp b/sword2/sprite.cpp index a0ba7f7189..a0ba7f7189 100644 --- a/sword2/driver/sprite.cpp +++ b/sword2/sprite.cpp |