This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw.
commit a1897418e64927e061162c06ca19c467cabd620e Author: [email protected] <[email protected]@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a> Date: Mon Sep 15 22:26:08 2014 +0000 SP: Align BASE_CFLAGS in Makefile with MP's / Fix a compiler warning --- SP/Makefile | 20 +++++++++++--------- SP/code/game/g_func_decs.h | 2 +- SP/code/game/g_main.c | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/SP/Makefile b/SP/Makefile index 4896b0a..a5437ec 100644 --- a/SP/Makefile +++ b/SP/Makefile @@ -367,7 +367,7 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu")) endif endif - BASE_CFLAGS = -Wall -fno-strict-aliasing \ + BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ -pipe -DUSE_ICON CLIENT_CFLAGS += $(SDL_CFLAGS) @@ -462,7 +462,7 @@ ifeq ($(PLATFORM),darwin) RENDERER_LIBS= OPTIMIZEVM= - BASE_CFLAGS = -Wall -mmacosx-version-min=10.5 \ + BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes -mmacosx-version-min=10.5 \ -DMAC_OS_X_VERSION_MIN_REQUIRED=1050 ifeq ($(ARCH),ppc) @@ -604,7 +604,7 @@ ifeq ($(PLATFORM),mingw32) $(error Cannot find a suitable cross compiler for $(PLATFORM)) endif - BASE_CFLAGS = -Wall -fno-strict-aliasing \ + BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ -DUSE_ICON # In the absence of wspiapi.h, require Windows XP or later @@ -720,7 +720,7 @@ ifeq ($(PLATFORM),freebsd) # flags BASE_CFLAGS = $(shell env MACHINE_ARCH=$(ARCH) make -f /dev/null -VCFLAGS) \ - -Wall -fno-strict-aliasing \ + -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON CLIENT_CFLAGS += $(SDL_CFLAGS) HAVE_VM_COMPILED = true @@ -774,7 +774,7 @@ else # ifeq freebsd ifeq ($(PLATFORM),openbsd) - BASE_CFLAGS = -Wall -fno-strict-aliasing \ + BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ -pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON CLIENT_CFLAGS += $(SDL_CFLAGS) @@ -859,7 +859,7 @@ ifeq ($(PLATFORM),netbsd) SHLIBLDFLAGS=-shared $(LDFLAGS) THREAD_LIBS=-lpthread - BASE_CFLAGS = -Wall -fno-strict-aliasing + BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes ifeq ($(ARCH),x86) HAVE_VM_COMPILED=true @@ -913,7 +913,7 @@ ifeq ($(PLATFORM),sunos) endif endif - BASE_CFLAGS = -Wall -fno-strict-aliasing \ + BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ -pipe -DUSE_ICON CLIENT_CFLAGS += $(SDL_CFLAGS) @@ -1177,10 +1177,12 @@ ifeq ($(BUILD_FRENCH),1) CLIENT_CFLAGS += -DBUILD_FRENCH endif + BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\" -BASE_CFLAGS += -Wformat=2 -Wformat-security -Wno-format-nonliteral +BASE_CFLAGS += -Wformat=2 -Wno-format-zero-length -Wformat-security -Wno-format-nonliteral BASE_CFLAGS += -Wstrict-aliasing=2 -Wmissing-format-attribute BASE_CFLAGS += -Wdisabled-optimization +BASE_CFLAGS += -Werror-implicit-function-declaration ifeq ($(V),1) echo_cmd=@: @@ -1258,7 +1260,7 @@ endef define DO_SPLINE_CXX $(echo_cmd) "SPLINE_CXX $<" -$(Q)$(CXX) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< +$(Q)$(CXX) $(NOTSHLIBCFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< endef ############################################################################# diff --git a/SP/code/game/g_func_decs.h b/SP/code/game/g_func_decs.h index 0c0047d..732f253 100644 --- a/SP/code/game/g_func_decs.h +++ b/SP/code/game/g_func_decs.h @@ -984,7 +984,7 @@ extern void QDECL Com_Printf ( const char * msg , ... ) ; extern void QDECL Com_Error ( int level , const char * error , ... ) ; extern void G_ShutdownGame ( int restart ) ; extern void G_InitGame ( int levelTime , int randomSeed , int restart ) ; -extern int G_SendMissionStats ( ) ; +extern int G_SendMissionStats ( void ) ; extern void G_SpawnScriptCamera ( void ) ; extern void G_UpdateCvars ( void ) ; extern void G_RegisterCvars ( void ) ; diff --git a/SP/code/game/g_main.c b/SP/code/game/g_main.c index e8d890b..483d0e8 100644 --- a/SP/code/game/g_main.c +++ b/SP/code/game/g_main.c @@ -1110,7 +1110,7 @@ G_SendMissionStats for updating the g_missionStats string to the client ============== */ -int G_SendMissionStats() { +int G_SendMissionStats( void ) { char cmd[MAX_QPATH]; gentity_t *player; int i, attempts = 0, playtime = 0, minutes, objs = 0, sec = 0, treas = 0; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
