From bfee768f519f8ef921507fc2160cbad7d4abc007 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 7 Mar 2003 16:21:28 +0000 Subject: temporary hack to get ScummVM to compile again svn-id: r6747 --- Makefile.common | 16 +++++++++++++--- 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 \ -- cgit v1.2.3