alignment & makefile fix

client/gui/CAnimation.cpp

@@ -75,9 +75,9 @@ class CFileCache
 	static const int cacheSize = 50; //Max number of cached files
 	struct FileData
 	{
-		ResourceID				name;
-		size_t					size;
-		std::unique_ptr<ui8[]>	data;
+		ResourceID             name;
+		size_t                 size;
+		std::unique_ptr<ui8[]> data;
 
 		std::unique_ptr<ui8[]> getCopy()
 		{

client/gui/CAnimation.h

@@ -39,8 +39,8 @@ private:
 	//offset[group][frame] - offset of frame data in file
 	std::map<size_t, std::vector <size_t> > offset;
 
-	std::unique_ptr<ui8[]>			data;
-	std::unique_ptr<SDL_Color[]>	palette;
+	std::unique_ptr<ui8[]>       data;
+	std::unique_ptr<SDL_Color[]> palette;
 
 public:
 	CDefFile(std::string Name);

lib/CMakeLists.txt

@@ -11,11 +11,11 @@ set(lib_SRCS
 		filesystem/CCompressedStream.cpp
 		filesystem/CFilesystemLoader.cpp
 		filesystem/CArchiveLoader.cpp
-		filesystem/CFileInfo.cpp
 		filesystem/CMemoryStream.cpp
 		filesystem/CBinaryReader.cpp
 		filesystem/CFileInputStream.cpp
 		filesystem/CZipLoader.cpp
+		filesystem/FileInfo.cpp
 		filesystem/Filesystem.cpp
 		filesystem/FileStream.cpp
 		filesystem/ResourceID.cpp

lib/filesystem/ResourceID.cpp

@@ -53,17 +53,15 @@ ResourceID::ResourceID()
 }
 #endif
 
-ResourceID::ResourceID(std::string name_)
-	:type{readType(name_)},
+ResourceID::ResourceID(std::string name_):
+	type{readType(name_)},
 	name{readName(std::move(name_))}
-{
-}
+{}
 
-ResourceID::ResourceID(std::string name_, EResType::Type type_)
-	:type{type_},
+ResourceID::ResourceID(std::string name_, EResType::Type type_):
+	type{type_},
 	name{readName(std::move(name_))}
-{
-}
+{}
 #if 0
 std::string ResourceID::getName() const
 {