diff options
| author | agent-q | 2011-05-21 15:51:13 +0100 |
|---|---|---|
| committer | agent-q | 2011-05-21 15:51:13 +0100 |
| commit | 6fdec4dfac164fd131c4e36a67a789b4b17878a7 (patch) | |
| tree | 2d5a3216f90dbb841789bf6a64be2f3d8b711a07 | |
| parent | 987d966acc72083d1c63926e719ee3198e24ec83 (diff) | |
| download | scummvm-rg350-6fdec4dfac164fd131c4e36a67a789b4b17878a7.tar.gz scummvm-rg350-6fdec4dfac164fd131c4e36a67a789b4b17878a7.tar.bz2 scummvm-rg350-6fdec4dfac164fd131c4e36a67a789b4b17878a7.zip | |
DS: Various changes
- Enable libmad
- Remove forced include of scummsys.h, it caused problems in the forbidden symbols code.
| -rw-r--r-- | backends/platform/ds/arm9/makefile | 6 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/dsmain.cpp | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile index 781738265c..62473bca6c 100644 --- a/backends/platform/ds/arm9/makefile +++ b/backends/platform/ds/arm9/makefile @@ -75,7 +75,7 @@ else ifdef DS_BUILD_K else - # USE_MAD = 1 + USE_MAD = 1 endif endif endif @@ -245,7 +245,7 @@ ifdef USE_MAD DEFINES += -DUSE_MAD endif -DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE -DDISABLE_MASS_ADD -DDISABLE_NES_APU +DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE -DDISABLE_MASS_ADD -DDISABLE_NES_APU -DNDEBUG LDFLAGS = -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt -Wl,--gc-sections @@ -259,7 +259,7 @@ BACKEND := ds INCLUDES= -I$(portdir)/$(BUILD) -I$(srcdir) -I$(srcdir)/engines \ -I$(portdir)/data -I$(portdir)/../commoninclude \ -I$(portdir)/source -I$(portdir)/source/mad \ - -I$(libndsdir)/include -include $(srcdir)/common/scummsys.h + -I$(libndsdir)/include -include $(portdir)/source/portdefs.h LIBS = -lm -L$(libndsdir)/lib -L$(portdir)/lib -lnds9 diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index 303e504873..b94b433373 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -579,7 +579,7 @@ void initGame() { for (int r = 0; r < NUM_SUPPORTED_GAMES; r++) { if (!stricmp(gameName, gameList[r].gameId)) { s_currentGame = &gameList[r]; - // consolePrintf("Game list num: %d\n", s_currentGame); + // consolePrintf("Game list num: %d\n", r); } } } @@ -1672,8 +1672,7 @@ void addEventsToQueue() { if (!keyboardEnable) { - - if ((isScrollingWithDPad() || (indyFightState)) && (displayModeIs8Bit)) { + if ((!isScrollingWithDPad() || (indyFightState)) && (displayModeIs8Bit)) { // Controls specific to the control method if (s_currentGame->control == CONT_SKY) { |