From ee48d5a248edcb83f783b0be852b3834929038c1 Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Sun, 6 Jul 2014 18:15:47 -0400 Subject: [PATCH] ecere/3D/Mesh: Correction to warning fix; default.cf: Clang build fix on Debian --- Makefile | 1 + default.cf | 6 ++++++ ecere/src/gfx/3D/Mesh.ec | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c00f713..d905252 100644 --- a/Makefile +++ b/Makefile @@ -832,3 +832,4 @@ troubleshoot: @$(call echo,GIT_REPOSITORY=$(GIT_REPOSITORY)) @$(call echo,DIR_VER=$(DIR_VER)) @$(call echo,REPOSITORY_VER=$(REPOSITORY_VER)) + @$(call echo,CPPFLAGS=$(CPPFLAGS)) diff --git a/default.cf b/default.cf index 8fb621a..cd1697c 100644 --- a/default.cf +++ b/default.cf @@ -40,6 +40,12 @@ TARGET_ARCH :=$(shell $(CC) -dumpmachine) else TARGET_ARCH := i386 endif + else + ifdef LINUX_TARGET + ifneq ($(filter x86_64-pc-linux-gnu,$(TARGET_ARCH)),) # Fix for PREFIXLIBDIR / DEB_HOST_MULTIARCH with Clang on Debian + TARGET_ARCH := x86_64-linux-gnu + endif + endif endif endif diff --git a/ecere/src/gfx/3D/Mesh.ec b/ecere/src/gfx/3D/Mesh.ec index 335ffe5..29815ed 100644 --- a/ecere/src/gfx/3D/Mesh.ec +++ b/ecere/src/gfx/3D/Mesh.ec @@ -122,7 +122,7 @@ public: bool Allocate(MeshFeatures what, int nVertices, DisplaySystem displaySystem) { bool result = false; - if((!nVertices || this.nVertices == nVertices) && (!this.displaySystem || this.displaySystem == displaySystem)) + if((!this.nVertices || this.nVertices == nVertices) && (!this.displaySystem || this.displaySystem == displaySystem)) { flags |= what; this.nVertices = nVertices; -- 1.8.3.1