Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-25 15:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved Font.h/.cpp to the "resources" directory (since it's a Reloadable).

Browse source
This commit is contained in:
Aloshi 2013-10-04 18:24:41 -05:00
parent b510aa8cd4
commit a6dbaa2dea
16 changed files with 697 additions and 697 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -137,7 +137,6 @@ set(ES_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/src/EmulationStation.h ${CMAKE_CURRENT_SOURCE_DIR}/src/EmulationStation.h
${CMAKE_CURRENT_SOURCE_DIR}/src/FileData.h ${CMAKE_CURRENT_SOURCE_DIR}/src/FileData.h
${CMAKE_CURRENT_SOURCE_DIR}/src/FolderData.h ${CMAKE_CURRENT_SOURCE_DIR}/src/FolderData.h
${CMAKE_CURRENT_SOURCE_DIR}/src/Font.h
${CMAKE_CURRENT_SOURCE_DIR}/src/GameData.h ${CMAKE_CURRENT_SOURCE_DIR}/src/GameData.h
${CMAKE_CURRENT_SOURCE_DIR}/src/GuiComponent.h ${CMAKE_CURRENT_SOURCE_DIR}/src/GuiComponent.h
${CMAKE_CURRENT_SOURCE_DIR}/src/HttpReq.h ${CMAKE_CURRENT_SOURCE_DIR}/src/HttpReq.h
@ -186,6 +185,7 @@ set(ES_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/TheArchiveScraper.h ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/TheArchiveScraper.h
${CMAKE_CURRENT_SOURCE_DIR}/src/pugiXML/pugiconfig.hpp ${CMAKE_CURRENT_SOURCE_DIR}/src/pugiXML/pugiconfig.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/pugiXML/pugixml.hpp ${CMAKE_CURRENT_SOURCE_DIR}/src/pugiXML/pugixml.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/resources/Font.h
${CMAKE_CURRENT_SOURCE_DIR}/src/resources/ResourceManager.h ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/ResourceManager.h
${CMAKE_CURRENT_SOURCE_DIR}/src/resources/TextureResource.h ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/TextureResource.h
${CMAKE_CURRENT_SOURCE_DIR}/data/Resources.h ${CMAKE_CURRENT_SOURCE_DIR}/data/Resources.h
@ -193,7 +193,6 @@ set(ES_HEADERS
set(ES_SOURCES set(ES_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/AudioManager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/AudioManager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/FolderData.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/FolderData.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/Font.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/GameData.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/GameData.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/GuiComponent.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/GuiComponent.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/HttpReq.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/HttpReq.cpp
@ -240,6 +239,7 @@ set(ES_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBScraper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBScraper.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/TheArchiveScraper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/TheArchiveScraper.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/pugiXML/pugixml.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/pugiXML/pugixml.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/resources/Font.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/resources/ResourceManager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/ResourceManager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/resources/TextureResource.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/TextureResource.cpp

2
src/Renderer_draw_gl.cpp
View file

@ -2,7 +2,7 @@
#include "Renderer.h" #include "Renderer.h"
#include GLHEADER #include GLHEADER
#include <iostream> #include <iostream>
#include "Font.h" #include "resources/Font.h"
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include "Log.h" #include "Log.h"
#include <stack> #include <stack>

2
src/Renderer_init.cpp
View file

@ -1,7 +1,7 @@
#include "Renderer.h" #include "Renderer.h"
#include "platform.h" #include "platform.h"
#include GLHEADER #include GLHEADER
#include "Font.h" #include "resources/Font.h"
namespace Renderer namespace Renderer
{ {

2
src/Window.h
View file

@ -5,7 +5,7 @@
#include "InputManager.h" #include "InputManager.h"
#include "resources/ResourceManager.h" #include "resources/ResourceManager.h"
#include <vector> #include <vector>
#include "Font.h" #include "resources/Font.h"
class Window class Window
{ {

2
src/components/ButtonComponent.h
View file

@ -2,7 +2,7 @@
#include "../GuiComponent.h" #include "../GuiComponent.h"
#include <functional> #include <functional>
#include "../Font.h" #include "../resources/Font.h"
#include "NinePatchComponent.h" #include "NinePatchComponent.h"
class ButtonComponent : public GuiComponent class ButtonComponent : public GuiComponent

2
src/components/DateTimeComponent.h
View file

@ -2,7 +2,7 @@
#include "../GuiComponent.h" #include "../GuiComponent.h"
#include <boost/date_time.hpp> #include <boost/date_time.hpp>
#include "../Font.h" #include "../resources/Font.h"
class DateTimeComponent : public GuiComponent class DateTimeComponent : public GuiComponent
{ {

2
src/components/GuiDetectDevice.cpp
View file

@ -1,7 +1,7 @@
#include "GuiDetectDevice.h" #include "GuiDetectDevice.h"
#include "../Window.h" #include "../Window.h"
#include "../Renderer.h" #include "../Renderer.h"
#include "../Font.h" #include "../resources/Font.h"
#include "GuiInputConfig.h" #include "GuiInputConfig.h"
#include <iostream> #include <iostream>
#include <string> #include <string>

2
src/components/GuiInputConfig.cpp
View file

@ -1,7 +1,7 @@
#include "GuiInputConfig.h" #include "GuiInputConfig.h"
#include "../Window.h" #include "../Window.h"
#include "../Renderer.h" #include "../Renderer.h"
#include "../Font.h" #include "../resources/Font.h"
#include "GuiGameList.h" #include "GuiGameList.h"
#include "../Log.h" #include "../Log.h"

2
src/components/OptionListComponent.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "../GuiComponent.h" #include "../GuiComponent.h"
#include "../Font.h" #include "../resources/Font.h"
#include <vector> #include <vector>
#include <functional> #include <functional>
#include "../Renderer.h" #include "../Renderer.h"

2
src/components/SwitchComponent.cpp
View file

@ -1,6 +1,6 @@
#include "SwitchComponent.h" #include "SwitchComponent.h"
#include "../Renderer.h" #include "../Renderer.h"
#include "../Font.h" #include "../resources/Font.h"
#include "../Window.h" #include "../Window.h"
SwitchComponent::SwitchComponent(Window* window, bool state) : GuiComponent(window), mState(state) SwitchComponent::SwitchComponent(Window* window, bool state) : GuiComponent(window), mState(state)

2
src/components/TextComponent.h
View file

@ -2,7 +2,7 @@
#define _TEXTCOMPONENT_H_ #define _TEXTCOMPONENT_H_
#include "../GuiComponent.h" #include "../GuiComponent.h"
#include "../Font.h" #include "../resources/Font.h"
class TextComponent : public GuiComponent class TextComponent : public GuiComponent
{ {

2
src/components/TextEditComponent.cpp
View file

@ -1,6 +1,6 @@
#include "TextEditComponent.h" #include "TextEditComponent.h"
#include "../Log.h" #include "../Log.h"
#include "../Font.h" #include "../resources/Font.h"
#include "../Window.h" #include "../Window.h"
#include "../Renderer.h" #include "../Renderer.h"
#include "ComponentListComponent.h" #include "ComponentListComponent.h"

2
src/components/TextListComponent.h
View file

@ -2,7 +2,7 @@
#define _TEXTLISTCOMPONENT_H_ #define _TEXTLISTCOMPONENT_H_
#include "../Renderer.h" #include "../Renderer.h"
#include "../Font.h" #include "../resources/Font.h"
#include "../GuiComponent.h" #include "../GuiComponent.h"
#include "../InputManager.h" #include "../InputManager.h"
#include <vector> #include <vector>

2
src/components/ThemeComponent.h
View file

@ -6,7 +6,7 @@
#include "../GuiComponent.h" #include "../GuiComponent.h"
#include "../pugiXML/pugixml.hpp" #include "../pugiXML/pugixml.hpp"
#include "../AudioManager.h" #include "../AudioManager.h"
#include "../Font.h" #include "../resources/Font.h"
//This class loads an XML-defined list of GuiComponents. //This class loads an XML-defined list of GuiComponents.
class ThemeComponent : public GuiComponent class ThemeComponent : public GuiComponent

4
src/Font.cpp → src/resources/Font.cpp
View file

@ -2,9 +2,9 @@
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include "Renderer.h" #include "../Renderer.h"
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include "Log.h" #include "../Log.h"
FT_Library Font::sLibrary; FT_Library Font::sLibrary;
bool Font::libraryInitialized = false; bool Font::libraryInitialized = false;

4
src/Font.h → src/resources/Font.h
View file

@ -2,12 +2,12 @@
#define _FONT_H_ #define _FONT_H_
#include <string> #include <string>
#include "platform.h" #include "../platform.h"
#include GLHEADER #include GLHEADER
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include <Eigen/Dense> #include <Eigen/Dense>
#include "resources/ResourceManager.h" #include "ResourceManager.h"
class TextCache; class TextCache;