diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /backends/platform/ds/arm9 | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'backends/platform/ds/arm9')
| -rw-r--r-- | backends/platform/ds/arm9/makefile | 4 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/dsmain.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/portdefs.h | 4 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/touchkeyboard.cpp | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile index eedf75c256..bf9fc1d826 100644 --- a/backends/platform/ds/arm9/makefile +++ b/backends/platform/ds/arm9/makefile @@ -66,7 +66,7 @@ else # TODO: Inherit the earth uses so much RAM that I have removed libmad in order to # claw some back. - + else ifdef DS_BUILD_I @@ -236,7 +236,7 @@ CXXFLAGS= $(CFLAGS) -Wno-non-virtual-dtor -Wno-unknown-pragmas -Wno-reorder \ ASFLAGS = -mcpu=arm9tdmi -mthumb-interwork -DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555 -DDISABLE_DOSBOX_OPL -DDISABLE_DEFAULT_SAVEFILEMANAGER -DARM +DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_TEXT_CONSOLE -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555 -DDISABLE_DOSBOX_OPL -DDISABLE_DEFAULT_SAVEFILEMANAGER -DARM ifdef USE_MAD DEFINES += -DUSE_MAD endif diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index 95bfdfe40a..1525647c2e 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -3227,6 +3227,10 @@ int main(void) { int main() { +#ifndef DISABLE_TEXT_CONSOLE + consoleDebugInit(DebugDevice_NOCASH); + nocashMessage("startup\n"); +#endif DS::main(); } diff --git a/backends/platform/ds/arm9/source/portdefs.h b/backends/platform/ds/arm9/source/portdefs.h index cc38d66a73..ad36503e83 100644 --- a/backends/platform/ds/arm9/source/portdefs.h +++ b/backends/platform/ds/arm9/source/portdefs.h @@ -40,10 +40,6 @@ #define double float -#ifndef DISABLE_TEXT_CONSOLE -#define DISABLE_TEXT_CONSOLE -#endif - #ifndef DISABLE_COMMAND_LINE #define DISABLE_COMMAND_LINE #endif diff --git a/backends/platform/ds/arm9/source/touchkeyboard.cpp b/backends/platform/ds/arm9/source/touchkeyboard.cpp index 71f4f93c27..581509f939 100644 --- a/backends/platform/ds/arm9/source/touchkeyboard.cpp +++ b/backends/platform/ds/arm9/source/touchkeyboard.cpp @@ -177,7 +177,7 @@ void drawText(int tx, int ty, const char *string, bool highlight) { baseAddress[ty * 32 + tx + p] = baseValue | tile; } } - + } @@ -292,7 +292,7 @@ void drawAutoComplete() { // When there's no completions on the bottom of the screen, it acts like a mouse pad // so this text indicates that drawText(11, 18, "MOUSE AREA", true); - + } else { @@ -303,10 +303,10 @@ void drawAutoComplete() { for (int r = 0; r < autoCompleteCount; r++) { int y = 12 + (r % 6) * 2; int x = 0 + ((r / 6) * 16); - + drawText(x, y, autoCompleteWord[r], selectedCompletion == r); } - + } } |