From 4fcc97b0a6a7bf7f7648bfc77a8a6c6bc76c4631 Mon Sep 17 00:00:00 2001 From: Lance Date: Thu, 9 Dec 2010 08:52:33 +0000 Subject: [PATCH] GCC 4.4.4+ #pragma workarounds git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3691 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/pr_csqc.c | 3 ++- engine/gl/gl_shader.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/engine/client/pr_csqc.c b/engine/client/pr_csqc.c index dc8ab673d..157f3d173 100644 --- a/engine/client/pr_csqc.c +++ b/engine/client/pr_csqc.c @@ -108,7 +108,8 @@ typedef enum VF_CL_VIEWANGLES_Y = 35, VF_CL_VIEWANGLES_Z = 36, -#ifndef MINGW +// GCC hates these within if statements +#ifdef _MSC_VER #pragma message("FIXME: add cshift") #endif diff --git a/engine/gl/gl_shader.c b/engine/gl/gl_shader.c index c983f57bb..5410aba63 100644 --- a/engine/gl/gl_shader.c +++ b/engine/gl/gl_shader.c @@ -235,7 +235,8 @@ static qboolean Shader_EvaluateCondition(char **ptr) else if (!Q_stricmp(token, "normalmap") ) conditiontrue = conditiontrue == !!gl_bump.value; -#ifndef MINGW +// GCC hates these within if statements "error: expected '}' before 'else'" +#ifdef _MSC_VER #pragma message("shader fixme") #endif else if (!Q_stricmp(token, "diffuse") )