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 880c8b078955ca57d5c1c7d7144b90cc15fe5f88
Author: m4n4t4...@gmail.com
<m4n4t4...@gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date: Mon Oct 6 00:50:13 2014 +0000
All: Revert the CFLAGS changes in Makefile
---
MP/Makefile | 20 +++++++++-----------
SP/Makefile | 18 ++++++++----------
2 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/MP/Makefile b/MP/Makefile
index 16468cf..19e1edf 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -371,7 +371,7 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd"
"kfreebsd-gnu"))
endif
endif
- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+ BASE_CFLAGS = -Wall -fno-strict-aliasing \
-pipe -DUSE_ICON
CLIENT_CFLAGS += $(SDL_CFLAGS)
@@ -466,7 +466,7 @@ ifeq ($(PLATFORM),darwin)
RENDERER_LIBS=
OPTIMIZEVM=
- BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes -mmacosx-version-min=10.5
\
+ BASE_CFLAGS = -Wall -mmacosx-version-min=10.5 \
-DMAC_OS_X_VERSION_MIN_REQUIRED=1050
ifeq ($(ARCH),ppc)
@@ -608,7 +608,7 @@ ifeq ($(PLATFORM),mingw32)
$(error Cannot find a suitable cross compiler for $(PLATFORM))
endif
- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+ BASE_CFLAGS = -Wall -fno-strict-aliasing \
-DUSE_ICON
# In the absence of wspiapi.h, require Windows XP or later
@@ -724,7 +724,7 @@ ifeq ($(PLATFORM),freebsd)
# flags
BASE_CFLAGS = $(shell env MACHINE_ARCH=$(ARCH) make -f /dev/null -VCFLAGS) \
- -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+ -Wall -fno-strict-aliasing \
-DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
CLIENT_CFLAGS += $(SDL_CFLAGS)
HAVE_VM_COMPILED = true
@@ -778,7 +778,7 @@ else # ifeq freebsd
ifeq ($(PLATFORM),openbsd)
- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+ BASE_CFLAGS = -Wall -fno-strict-aliasing \
-pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
CLIENT_CFLAGS += $(SDL_CFLAGS)
@@ -863,7 +863,7 @@ ifeq ($(PLATFORM),netbsd)
SHLIBLDFLAGS=-shared $(LDFLAGS)
THREAD_LIBS=-lpthread
- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
+ BASE_CFLAGS = -Wall -fno-strict-aliasing
ifeq ($(ARCH),x86)
HAVE_VM_COMPILED=true
@@ -917,7 +917,7 @@ ifeq ($(PLATFORM),sunos)
endif
endif
- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+ BASE_CFLAGS = -Wall -fno-strict-aliasing \
-pipe -DUSE_ICON
CLIENT_CFLAGS += $(SDL_CFLAGS)
@@ -1185,12 +1185,10 @@ ifeq ($(USE_PBMD5),1)
CLIENT_CFLAGS += -DUSE_PBMD5
endif
-
BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
-BASE_CFLAGS += -Wformat=2 -Wno-format-zero-length -Wformat-security
-Wno-format-nonliteral
+BASE_CFLAGS += -Wformat=2 -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=@:
@@ -1268,7 +1266,7 @@ endef
define DO_SPLINE_CXX
$(echo_cmd) "SPLINE_CXX $<"
-$(Q)$(CXX) $(NOTSHLIBCFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
+$(Q)$(CXX) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
endef
#############################################################################
diff --git a/SP/Makefile b/SP/Makefile
index a5437ec..36c9feb 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 -Wimplicit -Wstrict-prototypes \
+ BASE_CFLAGS = -Wall -fno-strict-aliasing \
-pipe -DUSE_ICON
CLIENT_CFLAGS += $(SDL_CFLAGS)
@@ -462,7 +462,7 @@ ifeq ($(PLATFORM),darwin)
RENDERER_LIBS=
OPTIMIZEVM=
- BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes -mmacosx-version-min=10.5
\
+ BASE_CFLAGS = -Wall -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 -Wimplicit -Wstrict-prototypes \
+ BASE_CFLAGS = -Wall -fno-strict-aliasing \
-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 -Wimplicit -Wstrict-prototypes \
+ -Wall -fno-strict-aliasing \
-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 -Wimplicit -Wstrict-prototypes \
+ BASE_CFLAGS = -Wall -fno-strict-aliasing \
-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 -Wimplicit -Wstrict-prototypes
+ BASE_CFLAGS = -Wall -fno-strict-aliasing
ifeq ($(ARCH),x86)
HAVE_VM_COMPILED=true
@@ -913,7 +913,7 @@ ifeq ($(PLATFORM),sunos)
endif
endif
- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+ BASE_CFLAGS = -Wall -fno-strict-aliasing \
-pipe -DUSE_ICON
CLIENT_CFLAGS += $(SDL_CFLAGS)
@@ -1177,12 +1177,10 @@ ifeq ($(BUILD_FRENCH),1)
CLIENT_CFLAGS += -DBUILD_FRENCH
endif
-
BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
-BASE_CFLAGS += -Wformat=2 -Wno-format-zero-length -Wformat-security
-Wno-format-nonliteral
+BASE_CFLAGS += -Wformat=2 -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=@:
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
