diff options
author | Max Horn | 2008-05-31 19:02:35 +0000 |
---|---|---|
committer | Max Horn | 2008-05-31 19:02:35 +0000 |
commit | bd9671ba246b3d45a5c2d8311d1e800b633f3210 (patch) | |
tree | 40508bf3107e72047c6752cec1f2aadec1a4b864 /backends/platform/ds | |
parent | c3c695792c4e0c769cb3a30585ff48f4b6d6519a (diff) | |
download | scummvm-rg350-bd9671ba246b3d45a5c2d8311d1e800b633f3210.tar.gz scummvm-rg350-bd9671ba246b3d45a5c2d8311d1e800b633f3210.tar.bz2 scummvm-rg350-bd9671ba246b3d45a5c2d8311d1e800b633f3210.zip |
Fixing various warnings in the DS port
svn-id: r32428
Diffstat (limited to 'backends/platform/ds')
-rw-r--r-- | backends/platform/ds/arm9/source/cdaudio.cpp | 4 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/dsmain.cpp | 11 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/fat/disc_io.h | 2 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/gbampsave.cpp | 6 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/gbampsave.h | 4 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/osystem_ds.cpp | 4 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/ramsave.h | 4 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/wordcompletion.h | 5 |
8 files changed, 18 insertions, 22 deletions
diff --git a/backends/platform/ds/arm9/source/cdaudio.cpp b/backends/platform/ds/arm9/source/cdaudio.cpp index 9569a820f2..56ac4e8c09 100644 --- a/backends/platform/ds/arm9/source/cdaudio.cpp +++ b/backends/platform/ds/arm9/source/cdaudio.cpp @@ -21,8 +21,8 @@ */ #include "cdaudio.h" -#include "ds-fs.h" -#include "config-manager.h" +#include "backends/fs/ds/ds-fs.h" +#include "common/config-manager.h" #include "dsmain.h" #include "NDS/scummvm_ipc.h" #include "console2.h" diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index efa60015fb..c03a6b3e71 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -74,9 +74,9 @@ #include "system.h" #include "osystem_ds.h" #include "icons_raw.h" -#include "gba_nds_fat.h" -#include "disc_io.h" -#include "config-manager.h" +#include "fat/gba_nds_fat.h" +#include "fat/disc_io.h" +#include "common/config-manager.h" #include "engines/scumm/scumm.h" #include "keyboard_raw.h" #include "keyboard_pal_raw.h" @@ -89,14 +89,13 @@ #include "user_debugger.h" #endif #include "ramsave.h" -#include "disc_io.h" #include "blitters.h" #include "cartreset_nolibfat.h" #include "keys.h" #ifdef USE_PROFILER #include "profiler/cyg-profile.h" #endif -#include "ds-fs.h" +#include "backends/fs/ds/ds-fs.h" namespace DS { @@ -749,7 +748,7 @@ void displayMode16Bit() { if (displayModeIs8Bit) { - static int test = 0; +// static int test = 0; // consolePrintf("saving buffer... %d\n", test++); saveGameBackBuffer(); for (int r = 0; r < 32 * 32; r++) { diff --git a/backends/platform/ds/arm9/source/fat/disc_io.h b/backends/platform/ds/arm9/source/fat/disc_io.h index 05d4c020bd..2d3da1fc6f 100644 --- a/backends/platform/ds/arm9/source/fat/disc_io.h +++ b/backends/platform/ds/arm9/source/fat/disc_io.h @@ -53,7 +53,7 @@ //---------------------------------------------------------------------- #if defined _CF_USE_DMA && defined _CF_ALLOW_UNALIGNED - #error You can't use both DMA and unaligned memory + #error You can not use both DMA and unaligned memory #endif // When compiling for NDS, make sure NDS is defined diff --git a/backends/platform/ds/arm9/source/gbampsave.cpp b/backends/platform/ds/arm9/source/gbampsave.cpp index ca4e617e29..9c8af81a6e 100644 --- a/backends/platform/ds/arm9/source/gbampsave.cpp +++ b/backends/platform/ds/arm9/source/gbampsave.cpp @@ -21,9 +21,9 @@ */ #include "gbampsave.h" -#include "gba_nds_fat.h" -#include "ds-fs.h" -#include "config-manager.h" +#include "fat/gba_nds_fat.h" +#include "backends/fs/ds/ds-fs.h" +#include "common/config-manager.h" ///////////////////////// // GBAMP Save File diff --git a/backends/platform/ds/arm9/source/gbampsave.h b/backends/platform/ds/arm9/source/gbampsave.h index e9188b5312..d0cbc68bfd 100644 --- a/backends/platform/ds/arm9/source/gbampsave.h +++ b/backends/platform/ds/arm9/source/gbampsave.h @@ -23,8 +23,8 @@ #ifndef _GBAMPSAVE_H_ #define _GBAMPSAVE_H_ -#include "system.h" -#include "ds-fs.h" +#include "common/system.h" +#include "backends/fs/ds/ds-fs.h" #define SAVE_BUFFER_SIZE 100000 diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp index 1d8d39dcab..330d09403d 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.cpp +++ b/backends/platform/ds/arm9/source/osystem_ds.cpp @@ -32,12 +32,12 @@ #include "nds.h" #include "dsmain.h" #include "nds/registers_alt.h" -#include "config-manager.h" +#include "common/config-manager.h" #include "common/str.h" #include "cdaudio.h" #include "graphics/surface.h" #include "touchkeyboard.h" -#include "ds-fs-factory.h" +#include "backends/fs/ds/ds-fs-factory.h" OSystem_DS* OSystem_DS::_instance = NULL; diff --git a/backends/platform/ds/arm9/source/ramsave.h b/backends/platform/ds/arm9/source/ramsave.h index 6add649f56..f919da18db 100644 --- a/backends/platform/ds/arm9/source/ramsave.h +++ b/backends/platform/ds/arm9/source/ramsave.h @@ -23,8 +23,8 @@ #ifndef _RAMSAVE_H_ #define _RAMSAVE_H_ -#include "system.h" -#include "savefile.h" +#include "common/system.h" +#include "common/savefile.h" // SaveFileManager class diff --git a/backends/platform/ds/arm9/source/wordcompletion.h b/backends/platform/ds/arm9/source/wordcompletion.h index 39be8511bf..980277d6bb 100644 --- a/backends/platform/ds/arm9/source/wordcompletion.h +++ b/backends/platform/ds/arm9/source/wordcompletion.h @@ -1,10 +1,7 @@ - - - namespace DS { extern bool findWordCompletions(char* input); extern void addAutoCompleteLine(char* line); extern void sortAutoCompleteWordList(); -}
\ No newline at end of file +} |