diff options
| author | Travis Howell | 2002-04-14 08:49:49 +0000 |
|---|---|---|
| committer | Travis Howell | 2002-04-14 08:49:49 +0000 |
| commit | b7fb4888e587114bd90338a10669e99ab9fe385e (patch) | |
| tree | e30e62556d734bf7cdf8dd23441041e1714ee074 | |
| parent | 01062c65d0b1868409e9aa288bb64f3cb1a76bfe (diff) | |
| download | scummvm-rg350-b7fb4888e587114bd90338a10669e99ab9fe385e.tar.gz scummvm-rg350-b7fb4888e587114bd90338a10669e99ab9fe385e.tar.bz2 scummvm-rg350-b7fb4888e587114bd90338a10669e99ab9fe385e.zip | |
Minor changes
svn-id: r3935
| -rw-r--r-- | Makefile.mingw | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Makefile.mingw b/Makefile.mingw index 468921eb67..9bd202e54a 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -7,18 +7,16 @@ VPATH=$(SRC):$(SRC)/sound:$(SRC)/simon:$(SRC)/v3:$(SRC)/v4 SDL_CFLAGS=-I$(SRC)/sdl/include SDL_LIBS=-L$(SRC)/sdl/lib -lSDLmain -lSDL +# If MAD (MPEG Audio Decoder) header and library isn't installed remove -lmad and -DCOMPRESSED_SOUND_FILE CC = gcc CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar DEFINES = -DCOMPRESSED_SOUND_FILE -LDFLAGS := +LDFLAGS :=-mwindows -mconsole INCLUDES:= $(SDL_CFLAGS) -I./ -I./sound CPPFLAGS= $(DEFINES) $(INCLUDES) -LIBS = -lmingw32 -lwinmm -lwsock32 $(SDL_LIBS) -lmad -mwindows -mconsole - +LIBS = -lmingw32 -lwinmm -lwsock32 $(SDL_LIBS) -lmad EXEC=scummvm.exe -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 \ @@ -43,9 +41,9 @@ install: $(EXEC) strip $(EXEC) -o $(SCUMMVMPATH)/$(EXEC) dist: install - cp copying.txt $(SCUMMVMPATH)/copying.txt - cp readme.txt $(SCUMMVMPATH)/readme.txt - cp whatsnew.txt $(SCUMMVMPATH)/whatsnew.txt - cp SDL/README-SDL.txt $(SCUMMVMPATH)/README-SDL.txt - cp SDL/lib/SDL.dll $(SCUMMVMPATH)/SDL.dll - u2d $(SCUMMVMPATH)/readme.txt + cp copying.txt $(SCUMMVMPATH) + cp readme.txt $(SCUMMVMPATH) + cp whatsnew.txt $(SCUMMVMPATH) + cp SDL/README-SDL.txt $(SCUMMVMPATH) + cp SDL/lib/SDL.dll $(SCUMMVMPATH) + u2d $(SCUMMVMPATH)/*.txt |