diff --git a/include/Mw/Font.h b/include/Mw/Font.h index 4bddcfb..9340e37 100644 --- a/include/Mw/Font.h +++ b/include/Mw/Font.h @@ -1,7 +1,7 @@ /* $Id$ */ /*! * @file Mw/Font.h - * @brief Default font + * @brief Font */ #ifndef __MW_FONT_H__ #define __MW_FONT_H__ @@ -13,36 +13,6 @@ extern "C" { #endif -/*! - * @brief Default font data - */ -MWDECL MwFont MwFontData[]; - -/*! - * @brief Default bold font data - */ -MWDECL MwFont MwBoldFontData[]; - -/*! - * @brief Default TTF font data - */ -MWDECL unsigned char MwTTFData[]; - -/*! - * @brief Default TTF font size - */ -MWDECL unsigned int MwTTFDataSize; - -/*! - * @brief Default bold TTF font data - */ -MWDECL unsigned char MwBoldTTFData[]; - -/*! - * @brief Default bold TTF font size - */ -MWDECL unsigned int MwBoldTTFDataSize; - /*! * @brief Loads a TTF Font * @param data Data diff --git a/include/Mw/Milsko.h b/include/Mw/Milsko.h index 2bcdbc0..0b61e80 100644 --- a/include/Mw/Milsko.h +++ b/include/Mw/Milsko.h @@ -25,6 +25,7 @@ #include #include +#include #include #include diff --git a/include/Mw/Resource/Font.h b/include/Mw/Resource/Font.h new file mode 100644 index 0000000..0b24fcf --- /dev/null +++ b/include/Mw/Resource/Font.h @@ -0,0 +1,50 @@ +/* $Id$ */ +/*! + * @file Mw/Resource/Font.h + * @brief Default font resources + */ +#ifndef __MW_RESOURCE__FONT_H__ +#define __MW_RESOURCE_FONT_H__ + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/*! + * @brief Default font data + */ +MWDECL MwFont MwFontData[]; + +/*! + * @brief Default bold font data + */ +MWDECL MwFont MwBoldFontData[]; + +/*! + * @brief Default TTF font data + */ +MWDECL unsigned char MwTTFData[]; + +/*! + * @brief Default TTF font size + */ +MWDECL unsigned int MwTTFDataSize; + +/*! + * @brief Default bold TTF font data + */ +MWDECL unsigned char MwBoldTTFData[]; + +/*! + * @brief Default bold TTF font size + */ +MWDECL unsigned int MwBoldTTFDataSize; + +#ifdef __cplusplus +} +#endif + +#endif