diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /engines/scumm/module.mk | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'engines/scumm/module.mk')
| -rw-r--r-- | engines/scumm/module.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk index e5f0745dd6..cd89f5ffad 100644 --- a/engines/scumm/module.mk +++ b/engines/scumm/module.mk @@ -16,6 +16,7 @@ MODULE_OBJS := \ dialogs.o \ file.o \ file_nes.o \ + gfx_towns.o \ gfx.o \ he/resource_he.o \ he/script_v60he.o \ @@ -29,7 +30,6 @@ MODULE_OBJS := \ imuse/sysex_samnmax.o \ imuse/sysex_scumm.o \ input.o \ - midiparser_eup.o \ midiparser_ro.o \ object.o \ palette.o \ @@ -37,6 +37,7 @@ MODULE_OBJS := \ player_nes.o \ player_pce.o \ player_sid.o \ + player_towns.o \ player_v1.o \ player_v2.o \ player_v2a.o \ |