diff options
| -rw-r--r-- | Makefile | 37 | ||||
| -rw-r--r-- | Makefile.common | 39 | ||||
| -rw-r--r-- | Makefile.irix | 37 | ||||
| -rw-r--r-- | Makefile.macosx | 15 | ||||
| -rw-r--r-- | Makefile.x11 | 35 |
5 files changed, 63 insertions, 100 deletions
@@ -8,39 +8,8 @@ INCLUDES:= `sdl-config --cflags` -I./ -I./sound CPPFLAGS= $(DEFINES) $(INCLUDES) # Add -lmad for -DCOMPRESSED_SOUND_FILE -LIBS = `sdl-config --libs` -lncurses -lm -ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip +LIBS = `sdl-config --libs` -lncurses -INCS = scumm.h scummsys.h stdafx.h +OBJS = sdl.o -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/mixer.o debugrl.o \ - akos.o vars.o insane.o gameDetector.o init.o \ - v3/resource_v3.o v4/resource_v4.o 2xsai.o main.o \ - simon/midi.o simon/simon.o simon/simonsys.o sound/mididrv.o - -DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \ - windows.cpp debugrl.h whatsnew.txt readme.txt copying.txt \ - scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h - -.cpp.o: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o - -all: scummvm - -scummvm: $(OBJS) - $(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS) - -$(OBJS): Makefile - -clean: - rm -f $(OBJS) scummvm - -dist: - rm -f $(ZIPFILE) - zip -q $(ZIPFILE) $(DISTFILES) - -check: -$(OBJS): $(INCS) +include Makefile.common diff --git a/Makefile.common b/Makefile.common new file mode 100644 index 0000000000..4e392a3ea5 --- /dev/null +++ b/Makefile.common @@ -0,0 +1,39 @@ +# $Header$ +# This file is used by Makefile, Makefile.irix, Makefile.macosx and declares +# common rules, a list of common object files etc. + +ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip + +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 script_v1.o script_v2.o debug.o gui.o \ + sound/imuse.o sound/fmopl.o sound/mixer.o debugrl.o \ + akos.o vars.o insane.o gameDetector.o init.o \ + v3/resource_v3.o v4/resource_v4.o 2xsai.o main.o \ + simon/midi.o simon/simon.o simon/simonsys.o sound/mididrv.o + +DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \ + debugrl.h whatsnew.txt readme.txt copying.txt \ + scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h + +.cpp.o: + $(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o + +all: scummvm + +scummvm: $(OBJS) + $(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS) + +$(OBJS): Makefile + +clean: + rm -f $(OBJS) scummvm + +dist: + rm -f $(ZIPFILE) + zip -q $(ZIPFILE) $(DISTFILES) + +check: +$(OBJS): $(INCS) diff --git a/Makefile.irix b/Makefile.irix index 58e2db8680..62d89920ae 100644 --- a/Makefile.irix +++ b/Makefile.irix @@ -1,3 +1,5 @@ +# $Header$ + CC = CC CFLAGS = -O2 -Olimit 9000 -mips2 #CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar @@ -9,38 +11,7 @@ CPPFLAGS= $(DEFINES) $(INCLUDES) # Add -lmad for -DCOMPRESSED_SOUND_FILE LIBS = `sdl-config --libs` -lmad -lm -ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip - -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/mixer.o debugrl.o \ - akos.o vars.o insane.o gameDetector.o init.o \ - v3/resource_v3.o v4/resource_v4.o 2xsai.o main.o \ - simon/midi.o simon/simon.o simon/simonsys.o sound/mididrv.o - -DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \ - debugrl.h whatsnew.txt readme.txt copying.txt \ - scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h \ - -.cpp.o: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o - -all: scummvm - -scummvm: $(OBJS) - $(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS) - -$(OBJS): Makefile - -clean: - rm -f $(OBJS) scummvm -dist: - rm -f $(ZIPFILE) - zip -q $(ZIPFILE) $(DISTFILES) +OBJS = sdl.o -check: -$(OBJS): $(INCS) +include Makefile.common diff --git a/Makefile.macosx b/Makefile.macosx new file mode 100644 index 0000000000..2c0c873cb5 --- /dev/null +++ b/Makefile.macosx @@ -0,0 +1,15 @@ +# $Header$ + +CC = cc +CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar +DEFINES = -DUNIX -DMACOSX +LDFLAGS := +INCLUDES:= `sdl-config --cflags` -I./ -I./sound +CPPFLAGS= $(DEFINES) $(INCLUDES) + +# Add -lmad for -DCOMPRESSED_SOUND_FILE +LIBS = `sdl-config --libs` -lncurses -framework QuickTime -framework AudioUnit + +OBJS = sdl.o + +include Makefile.common diff --git a/Makefile.x11 b/Makefile.x11 index 6028ebb451..7ea3eb8ef4 100644 --- a/Makefile.x11 +++ b/Makefile.x11 @@ -9,38 +9,7 @@ CPPFLAGS= $(DEFINES) $(INCLUDES) # Add -lmad for -DCOMPRESSED_SOUND_FILE LIBS = -lXext -lX11 -lncurses -lm -lmad -lpthread -ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip -INCS = scumm.h scummsys.h stdafx.h +OBJS = mp3_cd.o x11.o -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 script_v1.o script_v2.o debug.o gui.o \ - sound/imuse.o sound/fmopl.o sound/mixer.o debugrl.o \ - akos.o vars.o insane.o gameDetector.o init.o mp3_cd.o\ - v3/resource_v3.o v4/resource_v4.o 2xsai.o main.o \ - simon/midi.o simon/simon.o simon/simonsys.o sound/mididrv.o x11.o - -DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \ - windows.cpp debugrl.h whatsnew.txt readme.txt copying.txt \ - scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h - -.cpp.o: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o - -all: scummvm - -scummvm: $(OBJS) - $(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS) - -$(OBJS): Makefile - -clean: - rm -f $(OBJS) scummvm - -dist: - rm -f $(ZIPFILE) - zip -q $(ZIPFILE) $(DISTFILES) - -check: -$(OBJS): $(INCS) +include Makefile.common |