From a5cb64f707b77e25f76694ad769c45afdf272636 Mon Sep 17 00:00:00 2001 From: BearOso Date: Fri, 7 Aug 2020 15:36:03 -0500 Subject: [PATCH] Add explicit declaration of tile unit templates. Silences warnings and prevents double-compilation. --- tile.cpp | 32 ++++++++++++++++++++++++++++++++ tileimpl.h | 1 - 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/tile.cpp b/tile.cpp index 4399b693..35d9b151 100644 --- a/tile.cpp +++ b/tile.cpp @@ -297,6 +297,38 @@ void S9xInitTileRenderer (void) } // Functions to select which converter and renderer to use. +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; + +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; + +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; +extern template struct TileImpl::Renderers; void S9xSelectTileRenderers (int BGMode, bool8 sub, bool8 obj) { diff --git a/tileimpl.h b/tileimpl.h index 6ebfa4ff..9ea546e5 100644 --- a/tileimpl.h +++ b/tileimpl.h @@ -793,7 +793,6 @@ namespace TileImpl { template struct DrawMode7MosaicBG2 : public DrawTileMosaic {}; - #undef DRAW_PIXEL } // namespace TileImpl