Daniele Bartolini 12 лет назад
Родитель
Сommit
5bb481e377
4 измененных файлов с 4 добавлено и 4 удалено
  1. 2 2
      src/CMakeLists.txt
  2. 1 1
      src/Crown.h
  3. 1 1
      src/FontResource.cpp
  4. 0 0
      src/FontResource.h

+ 2 - 2
src/CMakeLists.txt

@@ -3,7 +3,6 @@ set (SRC
 	Device.cpp
 	EventBuffer.cpp
 	Filesystem.cpp
-	Font.cpp
 	Image.cpp
 	MaterialResource.cpp
 	ResourceManager.cpp
@@ -14,6 +13,7 @@ set (SRC
 	TextureResource.cpp
 	TextResource.cpp
 	ScriptResource.cpp
+	FontResource.cpp
 	ArchiveResourceArchive.cpp
 	FileResourceArchive.cpp
 
@@ -28,7 +28,6 @@ set (HEADERS
 	Device.h
 	EventBuffer.h
 	Filesystem.h
-	Font.h
 	Glyph.h
 	Image.h
 	MaterialResource.h
@@ -42,6 +41,7 @@ set (HEADERS
 	TextureResource.h
 	TextResource.h
 	ScriptResource.h
+	FontResource.h
 	ArchiveResourceArchive.h
 	FileResourceArchive.h
 

+ 1 - 1
src/Crown.h

@@ -96,7 +96,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 // Engine
 #include "Camera.h"
 #include "Device.h"
-#include "Font.h"
 #include "Glyph.h"
 #include "Image.h"
 #include "ResourceArchive.h"
@@ -109,6 +108,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "TextureResource.h"
 #include "ScriptResource.h"
 #include "MaterialResource.h"
+#include "FontResource.h"
 
 // Engine/Filesystem
 #include "Filesystem.h"

+ 1 - 1
src/Font.cpp → src/FontResource.cpp

@@ -24,7 +24,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "Types.h"
-#include "Font.h"
+#include "FontResource.h"
 
 namespace crown
 {

+ 0 - 0
src/Font.h → src/FontResource.h