From 112d65084348d991c6bbb1866d82ce5d1d6d7bf1 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Tue, 25 Nov 2014 23:46:28 +0000 Subject: [PATCH] Fix POLYMER=0 build and a couple of unused-variable warnings with it. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4764 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/include/polymost.h | 1 + polymer/eduke32/build/src/mdsprite.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/polymer/eduke32/build/include/polymost.h b/polymer/eduke32/build/include/polymost.h index ca3f86e91..df5625eaf 100644 --- a/polymer/eduke32/build/include/polymost.h +++ b/polymer/eduke32/build/include/polymost.h @@ -5,6 +5,7 @@ #include "glbuild.h" #include "hightile.h" +#include "baselayer.h" // glinfo typedef struct { uint8_t r, g, b, a; } coltype; diff --git a/polymer/eduke32/build/src/mdsprite.c b/polymer/eduke32/build/src/mdsprite.c index 05fadccf6..ed95b5f2d 100644 --- a/polymer/eduke32/build/src/mdsprite.c +++ b/polymer/eduke32/build/src/mdsprite.c @@ -85,8 +85,10 @@ static int32_t allocvbos = 0, curvbo = 0; static GLuint *vertvbos = NULL; static GLuint *indexvbos = NULL; +#ifdef POLYMER static int32_t *tribuf = NULL; static int32_t tribufverts = 0; +#endif static mdmodel_t *mdload(const char *); static void mdfree(mdmodel_t *); @@ -143,7 +145,9 @@ void freeallmodels() } md_freevbos(); +#ifdef POLYMER DO_FREE_AND_NULL(tribuf); +#endif }