From 5fb37d890753beb9933e82235e4f17ae4413cd4b Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 26 Apr 2002 13:39:31 +0000 Subject: Slightly revised Makefiles, now share common stuff in Makefile.common; added simple Makefile for MacOS X svn-id: r4088 --- Makefile.x11 | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) (limited to 'Makefile.x11') 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 -- cgit v1.2.3