aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2002-04-13 01:47:19 +0000
committerTravis Howell2002-04-13 01:47:19 +0000
commit087a6ed76121632ea0f1a55770082db977b26212 (patch)
tree1ed5d73c413eaa7b0f3e036121b7eb321097493f
parent4e1e1e7552084c7db4ad7756bef84951596ecda6 (diff)
downloadscummvm-rg350-087a6ed76121632ea0f1a55770082db977b26212.tar.gz
scummvm-rg350-087a6ed76121632ea0f1a55770082db977b26212.tar.bz2
scummvm-rg350-087a6ed76121632ea0f1a55770082db977b26212.zip
Added main.cpp and extra simon *.cpp files to makefiles
svn-id: r3914
-rw-r--r--Makefile3
-rw-r--r--Makefile.mingw8
2 files changed, 7 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 49e11168a5..125023cbbe 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,8 @@ OBJS = actor.o boxes.o costume.o gfx.o object.o resource.o \
sys.o verbs.o sdl.o script_v1.o script_v2.o debug.o gui.o \
sound/imuse.o sound/fmopl.o sound/adlib.o sound/gmidi.o debugrl.o \
akos.o vars.o insane.o gameDetector.o init.o mp3_cd.o\
- v3/resource_v3.o v4/resource_v4.o
+ v3/resource_v3.o v4/resource_v4.o 2xsai.o main.o \
+ simon/midi.o simon/simon.o simon/simonsys.o
DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \
windows.cpp debugrl.h whatsnew.txt readme.txt copying.txt \
diff --git a/Makefile.mingw b/Makefile.mingw
index ae541036ee..6fe7c3f246 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -1,6 +1,7 @@
# Where is scummvm will be installed
SCUMMVMPATH=C:/scummvm
SRC=.
+VPATH=$(SRC):$(SRC)/sound:$(SRC)/simon:$(SRC)/v3:$(SRC)/v4
### Modify these paths
SDL_CFLAGS=-I$(SRC)/sdl/include
@@ -21,9 +22,10 @@ INCS = scumm.h scummsys.h stdafx.h
OBJS = actor.o boxes.o costume.o gfx.o object.o resource.o \
saveload.o script.o scummvm.o sound.o string.o \
sys.o verbs.o sdl.o script_v1.o script_v2.o debug.o gui.o \
- sound/imuse.o sound/fmopl.o sound/adlib.o sound/gmidi.o debugrl.o \
- akos.o vars.o insane.o gameDetector.o init.o \
- v3/resource_v3.o v4/resource_v4.o mp3_cd.o
+ imuse.o fmopl.o adlib.o gmidi.o debugrl.o \
+ akos.o vars.o insane.o gameDetector.o init.o mp3_cd.o \
+ resource_v3.o resource_v4.o 2xsai.o main.o \
+ midi.o simon.o simonsys.o
.cpp.o:
$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o