[Scummvm-cvs-logs] CVS: scummvm Makefile.mingw,1.13,1.14

[Travis Howell]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv6633

Modified Files:
	Makefile.mingw 
Log Message:

Minor changes


Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.mingw,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile.mingw	14 Apr 2002 08:30:26 -0000	1.13
--- Makefile.mingw	14 Apr 2002 08:49:49 -0000	1.14
***************
*** 8,23 ****
  SDL_LIBS=-L$(SRC)/sdl/lib -lSDLmain -lSDL
  
  CC      = gcc
  CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
  DEFINES = -DCOMPRESSED_SOUND_FILE
! LDFLAGS :=
  INCLUDES:= $(SDL_CFLAGS) -I./ -I./sound
  CPPFLAGS= $(DEFINES) $(INCLUDES)
! LIBS	= -lmingw32 -lwinmm -lwsock32 $(SDL_LIBS) -lmad -mwindows -mconsole
! 
  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 \
--- 8,21 ----
  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 :=-mwindows -mconsole
  INCLUDES:= $(SDL_CFLAGS) -I./ -I./sound
  CPPFLAGS= $(DEFINES) $(INCLUDES)
! LIBS	= -lmingw32 -lwinmm -lwsock32 $(SDL_LIBS) -lmad
  EXEC=scummvm.exe
  
  OBJS	= actor.o boxes.o costume.o gfx.o object.o resource.o \
  	saveload.o script.o scummvm.o sound.o string.o \
***************
*** 44,51 ****
  
  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
--- 42,49 ----
  
  dist:   install
! 	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