[Scummvm-cvs-logs] CVS: scummex Makefile,1.10,1.11 Makefile.mingw,1.5,1.6

Travis Howell kirben at users.sourceforge.net
Mon May 10 19:23:03 CEST 2004


Update of /cvsroot/scummvm/scummex
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2261

Modified Files:
	Makefile Makefile.mingw 
Log Message:

Remove warning, should not be used with C++ according to GCC 3.4.0


Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummex/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	1 Oct 2003 12:51:37 -0000	1.10
+++ Makefile	11 May 2004 02:22:26 -0000	1.11
@@ -14,7 +14,7 @@
 RESSW    := --define __WIN32__ --define __WIN95__ --define __GNUWIN32__
 REZ_CMD  := `wx-config --rezflags`
 OBJS     := file.o scummex.o resource.o image.o wxwindows.o descumm.o descumm6.o codec37.o codec47.o bomp.o scaler.o util.o
-CXXFLAGS := -DOSUNIX -g -O -Wall -Wuninitialized -Wshadow -Wstrict-prototypes -Wno-unused-variable -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
+CXXFLAGS := -DOSUNIX -g -O -Wall -Wuninitialized -Wshadow -Wno-unused-variable -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
 CXXFLAGS += `wx-config --cxxflags` `sdl-config --cflags`
 LIBS     := `wx-config --libs` `sdl-config --libs`
 INCLUDES := -I.

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/scummex/Makefile.mingw,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.mingw	5 Mar 2004 02:36:34 -0000	1.5
+++ Makefile.mingw	11 May 2004 02:22:27 -0000	1.6
@@ -22,7 +22,7 @@
 
 OBJS     := bomp.o codec37.o codec47.o descumm.o descumm6.o file.o image.o resource.o resources.o scaler.o scummex.o \
 	util.o wxwindows.o
-CXXFLAGS := -g -O -Wall -Wuninitialized -Wstrict-prototypes -Wno-unused-variable -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
+CXXFLAGS := -g -O -Wall -Wuninitialized -Wno-unused-variable -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
 CXXFLAGS += $(SDL_CFLAGS) $(WX_CFLAGS)
 LIBS     := $(SDL_LIBS) $(WX_LIBS) -lmingw32
 INCLUDES := -I.





More information about the Scummvm-git-logs mailing list