diff options
| author | Max Horn | 2002-04-27 11:06:27 +0000 |
|---|---|---|
| committer | Max Horn | 2002-04-27 11:06:27 +0000 |
| commit | c9ea27332cfdf02bb7852d85ba0bdbf14ecb470a (patch) | |
| tree | 4b9a8fb12bae0969dee33e83835cf9de42573577 | |
| parent | 01f5a7088664077e01e526d336cd057842c8b32a (diff) | |
| download | scummvm-rg350-c9ea27332cfdf02bb7852d85ba0bdbf14ecb470a.tar.gz scummvm-rg350-c9ea27332cfdf02bb7852d85ba0bdbf14ecb470a.tar.bz2 scummvm-rg350-c9ea27332cfdf02bb7852d85ba0bdbf14ecb470a.zip | |
Makefile.mingw now uses Makefile.common, too
svn-id: r4105
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | Makefile.common | 4 | ||||
| -rw-r--r-- | Makefile.irix | 4 | ||||
| -rw-r--r-- | Makefile.macosx | 4 | ||||
| -rw-r--r-- | Makefile.mingw | 29 | ||||
| -rw-r--r-- | Makefile.x11 | 4 |
6 files changed, 25 insertions, 24 deletions
@@ -13,3 +13,7 @@ LIBS = `sdl-config --libs` -lncurses OBJS = sdl.o include Makefile.common + +dist: + rm -f $(ZIPFILE) + zip -q $(ZIPFILE) $(DISTFILES) diff --git a/Makefile.common b/Makefile.common index d72762ddcf..ca380787be 100644 --- a/Makefile.common +++ b/Makefile.common @@ -29,10 +29,6 @@ scummvm$(EXEEXT): $(OBJS) clean: rm -f $(OBJS) scummvm$(EXEEXT) -dist: - rm -f $(ZIPFILE) - zip -q $(ZIPFILE) $(DISTFILES) - $(OBJS): $(INCS) .PHONY: all clean dist diff --git a/Makefile.irix b/Makefile.irix index 62d89920ae..1cd508ec04 100644 --- a/Makefile.irix +++ b/Makefile.irix @@ -15,3 +15,7 @@ LIBS = `sdl-config --libs` -lmad -lm OBJS = sdl.o include Makefile.common + +dist: + rm -f $(ZIPFILE) + zip -q $(ZIPFILE) $(DISTFILES) diff --git a/Makefile.macosx b/Makefile.macosx index 6496682c16..2db6448411 100644 --- a/Makefile.macosx +++ b/Makefile.macosx @@ -13,3 +13,7 @@ LIBS = `sdl-config --libs` -framework QuickTime -framework AudioUnit OBJS = sdl.o include Makefile.common + +dist: + rm -f $(ZIPFILE) + zip -q $(ZIPFILE) $(DISTFILES) diff --git a/Makefile.mingw b/Makefile.mingw index e7d6a949fb..9f1bdd0bc2 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -1,7 +1,7 @@ # Where is scummvm will be installed SCUMMVMPATH=C:/scummvm SRC=. -VPATH=$(SRC):$(SRC)/sound:$(SRC)/simon:$(SRC)/v3:$(SRC)/v4 +VPATH=$(SRC) ### Modify these paths SDL_CFLAGS=-I$(SRC)/sdl/include @@ -15,30 +15,17 @@ LDFLAGS :=-mwindows -mconsole INCLUDES:= $(SDL_CFLAGS) -I./ -I./sound CPPFLAGS= $(DEFINES) $(INCLUDES) LIBS = -lmingw32 -lwinmm -lwsock32 -lmad $(SDL_LIBS) -EXEC=scummvm.exe +EXEEXT :=.exe -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 \ - imuse.o fmopl.o mixer.o debugrl.o \ - akos.o vars.o insane.o gameDetector.o init.o \ - resource_v3.o resource_v4.o 2xsai.o main.o \ - midi.o simon.o simonsys.o mididrv.o +OBJS = sdl.o -.cpp.o: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o +include Makefile.common -all: $(EXEC) -$(EXEC): $(OBJS) - $(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS) - -clean: - rm -f $(OBJS) $(EXEC) - -install: $(EXEC) +# Some additional targets +install: scummvm$(EXEEXT) mkdir -p $(SCUMMVMPATH) - strip $(EXEC) -o $(SCUMMVMPATH)/$(EXEC) + strip scummvm$(EXEEXT) -o $(SCUMMVMPATH)/scummvm$(EXEEXT) dist: install cp copying.txt $(SCUMMVMPATH) @@ -47,3 +34,5 @@ dist: install cp SDL/README-SDL.txt $(SCUMMVMPATH) cp SDL/lib/SDL.dll $(SCUMMVMPATH) u2d $(SCUMMVMPATH)/*.txt + +.PHONY: install dist diff --git a/Makefile.x11 b/Makefile.x11 index f4f6d08ffc..fcd8b92ffd 100644 --- a/Makefile.x11 +++ b/Makefile.x11 @@ -13,3 +13,7 @@ LIBS = -lXext -lX11 -lncurses -lm -lmad -lpthread OBJS = x11.o include Makefile.common + +dist: + rm -f $(ZIPFILE) + zip -q $(ZIPFILE) $(DISTFILES) |