diff options
| author | Max Horn | 2010-07-05 10:07:33 +0000 |
|---|---|---|
| committer | Max Horn | 2010-07-05 10:07:33 +0000 |
| commit | a9af5324489a88b34788baca0c29bbcf3a57f3bd (patch) | |
| tree | 9541af76697ab8ae06cbd38631a0f9e458382984 /backends/platform/ds/arm9 | |
| parent | db1fa71745a6604612f295c4f5a33169bde75a75 (diff) | |
| download | scummvm-rg350-a9af5324489a88b34788baca0c29bbcf3a57f3bd.tar.gz scummvm-rg350-a9af5324489a88b34788baca0c29bbcf3a57f3bd.tar.bz2 scummvm-rg350-a9af5324489a88b34788baca0c29bbcf3a57f3bd.zip | |
DS: Can now build binaries via our "configure/make" build system.
Conversion of the old build system is incomplete. Binaries created
using this new build system support most likely will not run!
More work is needed, but the work done so far should be enough
to get basic NDS support on our buildbot working.
svn-id: r50672
Diffstat (limited to 'backends/platform/ds/arm9')
| -rw-r--r-- | backends/platform/ds/arm9/makefile | 1 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/dsmain.cpp | 7 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/osystem_ds.cpp | 5 |
3 files changed, 11 insertions, 2 deletions
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile index 7f03f4c310..295b5f1bf0 100644 --- a/backends/platform/ds/arm9/makefile +++ b/backends/platform/ds/arm9/makefile @@ -202,7 +202,6 @@ endif #endif ARM7BIN := -7 $(CURDIR)/../../arm7/arm7.bin -ICON := -b ../../../logo.bmp "ScummVM;By Neil Millstone;" CC = arm-eabi-gcc CXX = arm-eabi-g++ diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index 5a63e5f08f..30ac0a7880 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -97,7 +97,7 @@ #endif #include "ramsave.h" #include "blitters.h" -#include "cartreset_nolibfat.h" +#include "libcartreset/cartreset_nolibfat.h" #include "keys.h" #ifdef USE_PROFILER #include "profiler/cyg-profile.h" @@ -3344,6 +3344,11 @@ int main(void) { const char *argv[] = {"/scummvmds", "--config=scummvmj.ini"}; #elif defined(DS_BUILD_K) const char *argv[] = {"/scummvmds", "--config=scummvmk.ini"}; +#else + // Use the default config file if no build was specified. This currently + // only happens with builds made using the regular ScummVM build system (as + // opposed to the nds specific build system). + const char *argv[] = {"/scummvmds"}; #endif diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp index 691fb2ec7a..9171151fde 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.cpp +++ b/backends/platform/ds/arm9/source/osystem_ds.cpp @@ -66,6 +66,11 @@ #define DEFAULT_CONFIG_FILE "scummvmj.ini" #elif defined(DS_BUILD_K) #define DEFAULT_CONFIG_FILE "scummvmk.ini" +#else + // Use the "scummvm.ini" as config file if no build was specified. This + // currently only happens with builds made using the regular ScummVM build + // system (as opposed to the nds specific build system). +#define DEFAULT_CONFIG_FILE "scummvm.ini" #endif OSystem_DS* OSystem_DS::_instance = NULL; |