aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/ds/arm9/makefile
AgeCommit message (Collapse)Author
2011-06-01Merge branch 'branch-1-3-0' into masterMax Horn
I manually resolved all conflicts, and inspected every single change. Many were due to the version string mismatch and thus easily resolved. The MSVC project files add in the 1-3-0 branch were not merged, neither where the changes to gui/themes/translations.dat. Conflicts: NEWS backends/base-backend.cpp backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp backends/module.mk backends/platform/ds/arm9/makefile backends/platform/psp/README.PSP backends/platform/samsungtv/main.cpp backends/platform/samsungtv/samsungtv.cpp backends/saves/posix/posix-saves.cpp base/commandLine.cpp base/internal_version.h base/main.cpp common/array.h configure devtools/create_project/create_project.cpp dists/android/AndroidManifest.xml dists/android/plugin-manifest.xml dists/iphone/Info.plist dists/irix/scummvm.spec dists/macosx/Info.plist dists/redhat/scummvm-tools.spec dists/redhat/scummvm.spec dists/scummvm.rc dists/slackware/scummvm.SlackBuild dists/wii/meta.xml engines/sci/parser/vocabulary.cpp engines/tinsel/handle.cpp gui/themes/translations.dat
2011-05-25BUILD: Rename USE_TEXT_CONSOLE -> USE_TEXT_CONSOLE_FOR_DEBUGGERMax Horn
This reduces the similarity in name to the otherwise mostly unrelated DISABLE_TEXT_CONSOLE #define.
2011-05-21DS: Various changesagent-q
- Enable libmad - Remove forced include of scummsys.h, it caused problems in the forbidden symbols code.
2010-11-18DS: Port changes from 1.2.0 branch to trunkMax Horn
svn-id: r54325
2010-10-12JANITORAL: Clean trailing whitespaces.Jordi Vilalta Prat
svn-id: r53160
2010-09-04DS: Enable stdout/err via nocash when DISABLE_COMMAND_LINE in not set.Andre Heider
svn-id: r52533
2010-08-02DS: More closely immitate CXXFLAGS of custom DS build systemMax Horn
svn-id: r51637
2010-07-31DS: Remove now redundant ds-fs.o from PORT_OBJSMax Horn
svn-id: r51558
2010-07-31DS: Fix custom DS build systemMax Horn
svn-id: r51555
2010-07-29DS: Get rid of DS_NON_SCUMM_BUILD and DS_SCUMM_BUILDMax Horn
svn-id: r51473
2010-07-29BUILD: Compile & link certain files only for specific BACKEND valuesMax Horn
svn-id: r51465
2010-07-07DS: Split buildrule for scummvm.nds and scummvm.ds.gbaMax Horn
This parallels what I did in ds.mk svn-id: r50744
2010-07-07DS: Remove cruft from MakefilesMax Horn
svn-id: r50743
2010-07-07DS: Fix some quirks in the NDS build system, remove some dead codeMax Horn
* remove (S)RAM save code (it has not been in use for quite some time) * remove the lz compressor (was only used by ram save code) * OPT_SPEED was set incorrectly * dsmain.cpp was misspelled as ds_main.cpp * remove unsed arm9 libcartreset (the copy in the arm7 directory still is around, though) svn-id: r50741
2010-07-07DS: Remove redundant lines from arm9/makefileMax Horn
svn-id: r50736
2010-07-06DS: cleanup arm9/makefileMax Horn
svn-id: r50729
2010-07-05DS: Remove unused portdefs.cppMax Horn
svn-id: r50691
2010-07-05DS: Can now build binaries via our "configure/make" build system.Max Horn
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
2010-05-29DS: Various fixes to allow the DS port to compile on DevkitARM r30 and ↵Neil Millstone
libnds 1.4.3. svn-id: r49313
2010-05-09Rename DISABLE_*SCALERS to USE_*SCALERS, and move the mk/cpp defines to ↵Andre Heider
configure. svn-id: r48977
2010-02-26DS: Attempting to rename Makefile to makefile. Not sure why it hasn't been ↵Neil Millstone
a problem in the past. svn-id: r48138
2009-09-27makefile -> NakefileAndre Heider
svn-id: r44408
2009-03-19Merged Neil's NDS changes into trunkMax Horn
svn-id: r39526
2008-12-21DS port: Removed mixer.cpp from OPTLIST (saves 11kb code size); added ↵Max Horn
several DEFINES which reduce the binary size further svn-id: r35468
2008-10-31Specified VECTOR_RENDERER_FORMAT to 1555 for DS build (at least from the ↵Johannes Schickel
code it looks like DS uses a 1555 overlay). svn-id: r34869
2008-09-15DS: Backported 0.12 changes to trunkMax Horn
svn-id: r34568
2008-09-14DS: Removed legacy GCC 2.x build code (NDS/DevKitPro uses GCC 3 or newer ↵Max Horn
anyway); thinned down INCLUDES some more; added a FIXME to the elf->bin rule svn-id: r34548
2008-09-14Changed VPATH to vpath, to allow building NDS port in parallel to another ↵Max Horn
port (for the records, this patch went to Neil in January, and he didn't complain) svn-id: r34544
2008-06-03DS: Forgot to commit #include changes in the ds-fs.* files; this allows to ↵Max Horn
get rid of -Isource/fat svn-id: r32520
2008-06-01Tweaks to DS makefiles.Robin Watts
1) It wouldn't build at all for me, because source/fat had been missed off the INCLUDES line. 2) Stray whitespace removed (to stop emacs warning on saving) 3) DS_BUILD flag selection reworked slightly. Now do: make all SCUMM_BUILD=x (where x is a,b,c,d,e,f,g) and it'll select that version and build it. If no x is supplied or x is not a-g, then version a will be built. 4) New allbuilds target. In backends/platform/ds, do: make allbuilds and versions A-G are built in turn (version G does not complete currently due to lack of logo g). This uses a 'semiclean' target in each makefile to clean just the files that change between versions. svn-id: r32470
2008-05-31DS: make sure DEPDIR and srcdir are inited, so that *.d files end up in the ↵Max Horn
right spot svn-id: r32437
2008-05-31DS: Fix compilation rule in Makefile to not compile everything twiceMax Horn
svn-id: r32436
2008-05-31DS: Adjust some compiler warningsMax Horn
svn-id: r32434
2008-05-31DS: Removed some pointless -I compiler directivesMax Horn
svn-id: r32433
2008-05-31DS: Use DEVKITPRO env var to find DevKitPro files, as the DevKitPro manual ↵Max Horn
suggests; it does not make sense to hardcode Neil's development environment paths by default svn-id: r32431
2008-05-15Porting changes from 0.11.0 branchNeil Millstone
svn-id: r32140
2008-05-15NDS: Rollback of the custom build target rule from .cpp.o to %.o: %.cppBertrand Augereau
svn-id: r32137
2008-05-06Unified BUILD_PLUGINS and DYNAMIC_MODULES in the makefilesJordi Vilalta Prat
svn-id: r31889
2008-05-06Allow static and dynamic plugins to be used at the same timeJordi Vilalta Prat
svn-id: r31888
2008-01-28Fixed the spaces before tabs.Jordi Vilalta Prat
svn-id: r30667
2008-01-27Removed trailing spaces.Jordi Vilalta Prat
svn-id: r30664
2007-12-21Scaler corruption fixes, scaler console fixes, adding Lure target (except it ↵Neil Millstone
doesn't quite work yet), adding function keys to virtual keyboard svn-id: r29944
2007-12-16Patch #1847599: Several enhancements for the build systemMax Horn
svn-id: r29889
2007-12-06NDS : ASM cpu scalers fixed, USING_ARM_BLITTERS backBertrand Augereau
svn-id: r29740
2007-12-05NDS: Disabling the buggy ARM blitters so that the CPU scaler worksBertrand Augereau
svn-id: r29731
2007-11-22updated backends/platform/ds/arm9/makefile.in to match changes made to ↵Max Horn
backends/platform/ds/arm9/makefile (next time, please modify makefile.in then run tools/update-version.pl) svn-id: r29611
2007-10-13Fixed a huge number of compile errors, moved over features from 0.10.0 branch.Neil Millstone
svn-id: r29203
2007-08-18Making DS port build againNeil Millstone
svn-id: r28654
2007-07-10This commit adds a new build define USE_ARM_GFX_ASM (and sets it for the WinCERobin Watts
and DS builds). This causes the scumm engines graphics code to call ARM routines to do drawStripToScreen and copy8col. These routines were originally written for the DS port, and have now been made available to any other ARM device out there that wants them. I've tested this change on WinCE, but can't test it on the DS as I don't have one. We know that the routines work there though. svn-id: r28016
2007-06-30- Show mouse cursor optionNeil Millstone
- Support for SAGA, CINE, and AGI - Key bindings for Gob3 - Assembler optimisations submitted by Robin Watts svn-id: r27803