thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NDS: Some tweaks for compiling via std build system

Browse source 
svn-id: r50582
This commit is contained in:
Max Horn 2010-07-01 23:12:28 +00:00
parent ac351c175f
commit 762ff57e0d
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
backends/platform/ds/arm9/source/portdefs.h
View file

@ -52,10 +52,17 @@ typedef signed int s32;
#define CT_NO_TRANSPARENCY
#ifndef DISABLE_TEXT_CONSOLE
#define DISABLE_TEXT_CONSOLE
#define DISABLE_COMMAND_LINE
#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!")

10
configure vendored
View file

@ -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"
;;
*)