diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | Makefile.common | 19 | ||||
| -rw-r--r-- | common/engine.cpp (renamed from scumm/engine.cpp) | 0 | ||||
| -rw-r--r-- | common/engine.h (renamed from scumm/engine.h) | 0 | ||||
| -rw-r--r-- | scumm/imuse.cpp | 10 |
5 files changed, 21 insertions, 18 deletions
@@ -4,9 +4,13 @@ CXX = c++ CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar DEFINES = LDFLAGS := -INCLUDES:= -I. -Icommon -Iscumm -Isound +INCLUDES:= -I. -Icommon -Iscumm LIBS = -lncurses +# Enable this if you want ScummVM to dump all scripts it runs. +# This is mainly interesting for developers. +# DEFINES += -DDUMP_SCRIPTS + # Uncomment this to activate the MAD lib for compressed sound files DEFINES += -DCOMPRESSED_SOUND_FILE LIBS += -lmad @@ -41,10 +45,6 @@ DEFINES += -DMACOSX # INCLUDES+= -I/usr/X11R6/include # LIBS += -lpthread -lXext -lX11 -# Enable this if you want ScummVM to dump all scripts it runs. -# This is mainly interesting for developers. -# DEFINES += -DDUMP_SCRIPTS - CPPFLAGS= $(DEFINES) $(INCLUDES) include Makefile.common diff --git a/Makefile.common b/Makefile.common index a47208a554..bedb4a30ef 100644 --- a/Makefile.common +++ b/Makefile.common @@ -9,18 +9,18 @@ ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip INCS = scumm/scumm.h common/scummsys.h common/stdafx.h -COMMON_OBJS = common/config-file.o common/gameDetector.o common/main.o \ - common/timer.o common/util.o +COMMON_OBJS = common/config-file.o common/engine.o common/gameDetector.o \ + common/main.o common/timer.o common/util.o GUI_OBJS = gui/gui.o gui/newgui.o gui/widget.o gui/dialog.o gui/ListWidget.o \ gui/ScrollBarWidget.o SCUMM_OBJS = scumm/actor.o scumm/akos.o scumm/boxes.o scumm/bundle.o \ - scumm/costume.o scumm/debug.o scumm/debugrl.o scumm/engine.o scumm/gfx.o \ - scumm/imuse.o scumm/insane.o scumm/object.o scumm/resource.o \ - scumm/resource_v3.o scumm/resource_v4.o scumm/saveload.o scumm/scaler.o \ - scumm/script.o scumm/script_v1.o scumm/script_v2.o scumm/scummvm.o \ - scumm/string.o scumm/sys.o scumm/vars.o scumm/verbs.o + scumm/costume.o scumm/debug.o scumm/debugrl.o scumm/gfx.o scumm/imuse.o \ + scumm/insane.o scumm/object.o scumm/resource.o scumm/resource_v3.o \ + scumm/resource_v4.o scumm/saveload.o scumm/scaler.o scumm/script.o \ + scumm/script_v1.o scumm/script_v2.o scumm/scummvm.o scumm/string.o \ + scumm/sys.o scumm/vars.o scumm/verbs.o SIMON_OBJS = simon/debug.o simon/items.o simon/midi.o simon/res.o simon/simon.o \ simon/sys.o simon/verb.o simon/vga.o @@ -49,7 +49,7 @@ simon/libsimon.a: $(SIMON_OBJS) clean: rm -f $(OBJS) $(SCUMM_OBJS) $(SIMON_OBJS) scummvm$(EXEEXT) -.PHONY: all clean dist +.PHONY: all clean dist distclean # Default (dumb) compile & dependcy rules #.cpp.o: @@ -71,3 +71,6 @@ DEPFILES = $(wildcard $(patsubst %,%/$(DEPDIR)/*.d,$(MODULES))) rm -f "$(*D)/$(DEPDIR)/$(*F).d2" -include $(DEPFILES) /dev/null + +distclean: clean + rm -rf $(DEPDIRS) diff --git a/scumm/engine.cpp b/common/engine.cpp index bd416f5f70..bd416f5f70 100644 --- a/scumm/engine.cpp +++ b/common/engine.cpp diff --git a/scumm/engine.h b/common/engine.h index 6241d70a7f..6241d70a7f 100644 --- a/scumm/engine.h +++ b/common/engine.h diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp index 93f2f99597..e2ef496bd3 100644 --- a/scumm/imuse.cpp +++ b/scumm/imuse.cpp @@ -20,11 +20,11 @@ */ #include "stdafx.h" -#include "scumm.h" -#include "fmopl.h" -#include "mididrv.h" -#include "imuse.h" -#include "saveload.h" +#include "scumm/scumm.h" +#include "sound/fmopl.h" +#include "sound/mididrv.h" +#include "scumm/imuse.h" +#include "scumm/saveload.h" /* * Some constants |