From 9d5a17c93e660285c375ff9ade75938466693ef3 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Fri, 28 Nov 2014 23:57:21 +0000 Subject: [PATCH] Eliminate -Wno-narrowing. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4771 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/Makefile.common | 7 ------- polymer/eduke32/build/src/mdsprite.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common index 8e5a8261c..57d9b83d4 100644 --- a/polymer/eduke32/Makefile.common +++ b/polymer/eduke32/Makefile.common @@ -392,13 +392,6 @@ ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4))) endif endif -# XXX: I (Helixhorned) only know that there's no -Wnarrowing on my OS X 10.6 using GCC 4.2. -ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4))) - ifeq (1,$(strip $(shell expr $(GCC_MINOR) \>= 3))) - CPPONLYFLAGS+= -Wno-narrowing - endif -endif - ifeq ($(PLATFORM),WII) override USE_LIBVPX = 0 override NETCODE = 0 diff --git a/polymer/eduke32/build/src/mdsprite.c b/polymer/eduke32/build/src/mdsprite.c index ed95b5f2d..c45df8f36 100644 --- a/polymer/eduke32/build/src/mdsprite.c +++ b/polymer/eduke32/build/src/mdsprite.c @@ -1592,7 +1592,7 @@ static void md3postload_common(md3model_t *m) do // while(++verti < m->head.surfs[surfi].numverts); { - vec3f_t f = { frameverts[verti].x, frameverts[verti].y, frameverts[verti].z }; + vec3f_t f = { (float)frameverts[verti].x, (float)frameverts[verti].y, (float)frameverts[verti].z }; if (!verti && !surfi) continue;