[Scummvm-cvs-logs] CVS: scummvm Makefile.mingw,1.25,1.26

Travis Howell kirben at users.sourceforge.net
Mon Jul 8 03:34:01 CEST 2002


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

Modified Files:
	Makefile.mingw 
Log Message:

Use correct compiler


Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.mingw,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile.mingw	17 Jun 2002 13:16:51 -0000	1.25
+++ Makefile.mingw	8 Jul 2002 10:33:02 -0000	1.26
@@ -8,14 +8,13 @@
 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
+CC      = g++
 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)
-#If compiling with GCC 2.95.x remove the -lstdc++
-LIBS	= -lmingw32 -lwinmm -lmad -lstdc++ $(SDL_LIBS)
+LIBS	= -lmingw32 -lwinmm -lmad $(SDL_LIBS)
 EXEEXT	:=.exe
 
 # Uncomment this for SDL normal output





More information about the Scummvm-git-logs mailing list