From e75bdffdbf155bc7348ca95c0217b0f46eb02444 Mon Sep 17 00:00:00 2001
From: Toad King <toadking@toadking.com>
Date: Thu, 13 Dec 2012 16:16:39 -0500
Subject: [PATCH] cleanup remaining font code

move font.bin and font.bmp used to generate binaryfont to gfx/fonts
---
 console/font.h                           |  29 -----------------------
 console/font.bin => gfx/fonts/bitmap.bin | Bin
 console/font.bmp => gfx/fonts/bitmap.bmp | Bin
 3 files changed, 29 deletions(-)
 delete mode 100644 console/font.h
 rename console/font.bin => gfx/fonts/bitmap.bin (100%)
 rename console/font.bmp => gfx/fonts/bitmap.bmp (100%)

diff --git a/console/font.h b/console/font.h
deleted file mode 100644
index 4e7e638e4c..0000000000
--- a/console/font.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2012 - Hans-Kristian Arntzen
- * 
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _CONSOLE_FONT_H
-#define _CONSOLE_FONT_H
-
-#define FONT_WIDTH 5
-#define FONT_HEIGHT 10
-#define FONT_WIDTH_STRIDE (FONT_WIDTH + 1)
-#define FONT_HEIGHT_STRIDE (FONT_HEIGHT + 1)
-
-#define FONT_OFFSET(x) ((x) * ((FONT_HEIGHT * FONT_WIDTH + 7) / 8))
-
-//extern uint8_t _binary_console_font_bmp_start[];
-extern uint8_t _binary_console_font_bin_start[];
-
-#endif
diff --git a/console/font.bin b/gfx/fonts/bitmap.bin
similarity index 100%
rename from console/font.bin
rename to gfx/fonts/bitmap.bin
diff --git a/console/font.bmp b/gfx/fonts/bitmap.bmp
similarity index 100%
rename from console/font.bmp
rename to gfx/fonts/bitmap.bmp