diff options
| author | Max Horn | 2010-07-01 23:12:28 +0000 |
|---|---|---|
| committer | Max Horn | 2010-07-01 23:12:28 +0000 |
| commit | 762ff57e0dd906e7a256c1d832c67f345faf8883 (patch) | |
| tree | 9f77a7f901c2244d707546c918235b4e3da05a0d | |
| parent | ac351c175f7201e49f175e80105bdc704a9ea02f (diff) | |
| download | scummvm-rg350-762ff57e0dd906e7a256c1d832c67f345faf8883.tar.gz scummvm-rg350-762ff57e0dd906e7a256c1d832c67f345faf8883.tar.bz2 scummvm-rg350-762ff57e0dd906e7a256c1d832c67f345faf8883.zip | |
NDS: Some tweaks for compiling via std build system
svn-id: r50582
| -rw-r--r-- | backends/platform/ds/arm9/source/portdefs.h | 7 | ||||
| -rwxr-xr-x | configure | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/backends/platform/ds/arm9/source/portdefs.h b/backends/platform/ds/arm9/source/portdefs.h index 5472b711b8..2590758c86 100644 --- a/backends/platform/ds/arm9/source/portdefs.h +++ b/backends/platform/ds/arm9/source/portdefs.h @@ -52,10 +52,17 @@ typedef signed int s32; #define CT_NO_TRANSPARENCY +#ifndef DISABLE_TEXT_CONSOLE #define DISABLE_TEXT_CONSOLE +#endif + +#ifndef DISABLE_COMMAND_LINE #define DISABLE_COMMAND_LINE +#endif +#ifndef DISABLE_COMMAND_LINE #define STREAM_AUDIO_FROM_DISK +#endif //#undef assert //#define assert(expr) consolePrintf("Asserted!") @@ -1138,9 +1138,12 @@ else CXX= for compiler in $compilers; do if test_compiler $compiler; then + echo "success testing compiler: $1" >> "$TMPLOG" CXX=$compiler echo $CXX break + else + echo "failure testing compiler: $1" >> "$TMPLOG" fi done fi @@ -1389,7 +1392,7 @@ case $_host_os in ;; nds) # TODO nds - DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT" + DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT -I$DEVKITPRO/libnds/include -isystem $DEVKITPRO/devkitARM/arm-eabi/include" ;; os2-emx*) DEFINES="$DEFINES -DUNIX" @@ -1572,7 +1575,7 @@ if test -n "$_host"; then # TODO: Maybe rename nds -> ds (would be more consistent with other backends) DEFINES="$DEFINES -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555" DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER" - DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE" + DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE -DSTREAM_AUDIO_FROM_DISK" DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE" _need_memalign=yes _backend="nds" @@ -2444,6 +2447,7 @@ case $_backend in ;; nds) # TODO nds + INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/arm9/source -I$(srcdir)/backends/platform/ds/commoninclude' ;; null) DEFINES="$DEFINES -DUSE_NULL_DRIVER" @@ -2512,7 +2516,7 @@ if test "$have_gcc" = yes ; then case $_host_os in # newlib-based system include files suppress non-C89 function # declarations under __STRICT_ANSI__ - mingw* | dreamcast | wii | gamecube | psp | wince | amigaos* | android) + mingw* | dreamcast | wii | gamecube | nds | psp | wince | amigaos* | android) CXXFLAGS="$CXXFLAGS -W -Wno-unused-parameter" ;; *) |