Makefile.mingw now uses Makefile.common, too
svn-id: r4105
This commit is contained in:
parent
01f5a70886
commit
c9ea27332c
6 changed files with 25 additions and 24 deletions
4
Makefile
4
Makefile
|
@ -13,3 +13,7 @@ LIBS = `sdl-config --libs` -lncurses
|
|||
OBJS = sdl.o
|
||||
|
||||
include Makefile.common
|
||||
|
||||
dist:
|
||||
rm -f $(ZIPFILE)
|
||||
zip -q $(ZIPFILE) $(DISTFILES)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -15,3 +15,7 @@ LIBS = `sdl-config --libs` -lmad -lm
|
|||
OBJS = sdl.o
|
||||
|
||||
include Makefile.common
|
||||
|
||||
dist:
|
||||
rm -f $(ZIPFILE)
|
||||
zip -q $(ZIPFILE) $(DISTFILES)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue