From d44b546b1007790914f7746e868bc3ea962ec97f Mon Sep 17 00:00:00 2001 From: Spoike Date: Sat, 4 Aug 2012 12:27:24 +0000 Subject: [PATCH] misc compile fixes. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4103 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 2 +- engine/gl/gl_backend.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index 1b9ce4806..89f7aaab3 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -455,7 +455,6 @@ CLIENT_OBJS = \ GLQUAKE_OBJS = \ gl_draw.o \ - gl_ngraph.o \ gl_backend.o \ gl_rmain.o \ gl_rmisc.o \ @@ -473,6 +472,7 @@ D3DQUAKE_OBJS = \ D3DGL_OBJS = \ gl_font.o \ + gl_ngraph.o \ gl_model.o \ gl_shader.o \ gl_shadow.o \ diff --git a/engine/gl/gl_backend.c b/engine/gl/gl_backend.c index e0e751b76..173217216 100644 --- a/engine/gl/gl_backend.c +++ b/engine/gl/gl_backend.c @@ -4267,7 +4267,8 @@ void GLBE_DrawWorld (qboolean drawworld, qbyte *vis) } */ - if (r_wireframe.ival) +#ifdef GL_LINE //no gles + if (r_wireframe.ival && qglPolygonMode) { BE_SelectMode(BEM_WIREFRAME); qglPolygonMode(GL_FRONT_AND_BACK, GL_LINE); @@ -4275,12 +4276,14 @@ void GLBE_DrawWorld (qboolean drawworld, qbyte *vis) BE_SelectMode(BEM_STANDARD); qglPolygonMode(GL_FRONT_AND_BACK, GL_FILL); } +#endif } else { GLBE_SubmitMeshes(false, SHADER_SORT_PORTAL, SHADER_SORT_NEAREST); - if (r_wireframe.ival) +#ifdef GL_LINE //no gles + if (r_wireframe.ival && qglPolygonMode) { BE_SelectMode(BEM_WIREFRAME); qglPolygonMode(GL_FRONT_AND_BACK, GL_LINE); @@ -4288,6 +4291,7 @@ void GLBE_DrawWorld (qboolean drawworld, qbyte *vis) BE_SelectMode(BEM_STANDARD); qglPolygonMode(GL_FRONT_AND_BACK, GL_FILL); } +#endif } BE_SelectEntity(&r_worldentity);