diff options
| author | Max Horn | 2003-03-07 16:21:28 +0000 |
|---|---|---|
| committer | Max Horn | 2003-03-07 16:21:28 +0000 |
| commit | bfee768f519f8ef921507fc2160cbad7d4abc007 (patch) | |
| tree | 18e9fca812d644caea8def2b681f9aabc56ca1bc | |
| parent | d62710b7101c9675a80d04d342463fb823ee14fb (diff) | |
| download | scummvm-rg350-bfee768f519f8ef921507fc2160cbad7d4abc007.tar.gz scummvm-rg350-bfee768f519f8ef921507fc2160cbad7d4abc007.tar.bz2 scummvm-rg350-bfee768f519f8ef921507fc2160cbad7d4abc007.zip | |
temporary hack to get ScummVM to compile again
svn-id: r6747
| -rw-r--r-- | Makefile.common | 16 | ||||
| -rw-r--r-- | common/module.mk | 1 |
2 files changed, 13 insertions, 4 deletions
diff --git a/Makefile.common b/Makefile.common index 47447aa655..2956554949 100644 --- a/Makefile.common +++ b/Makefile.common @@ -23,15 +23,25 @@ DEPDIR := .deps # module.mk of their parents. In fact the only reason they are listed here is to ensure the # DEPDIRS directive works correctly. MODULES += \ - scumm common simon sky gui backends sound \ - scumm/smush backends/fs/posix backends/fs/morphos backends/fs/windows backends/midi + scumm \ + simon \ + sky \ + common \ + gui \ + backends \ + sound \ + scumm/smush \ + backends/fs/posix \ + backends/fs/morphos \ + backends/fs/windows \ + backends/midi # Include the build instructions for all modules -include $(patsubst %,%/module.mk,$(MODULES)) scummvm$(EXEEXT): $(OBJS) - $(CXX) $(LDFLAGS) -o $@ $+ $(LIBS) + $(CXX) $(LDFLAGS) -o $@ common/engine.o $+ $(LIBS) clean: $(RM) $(OBJS) scummvm$(EXEEXT) diff --git a/common/module.mk b/common/module.mk index 400889c24c..56092b637c 100644 --- a/common/module.mk +++ b/common/module.mk @@ -2,7 +2,6 @@ MODULE := common MODULE_OBJS = \ common/config-file.o \ - common/engine.o \ common/file.o \ common/gameDetector.o \ common/main.o \ |