Add basic Linux build support
This commit is contained in:
@ -43,10 +43,10 @@ namespace PKG
|
||||
return result;
|
||||
}
|
||||
|
||||
float_t BinaryReader::ReadSingle()
|
||||
float BinaryReader::ReadSingle()
|
||||
{
|
||||
float_t result = 0;
|
||||
m_File.read(reinterpret_cast<char*>(&result), sizeof(float_t));
|
||||
float result = 0;
|
||||
m_File.read(reinterpret_cast<char*>(&result), sizeof(float));
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ namespace PKG
|
||||
|
||||
int32_t ReadInt32();
|
||||
uint32_t ReadUInt32();
|
||||
float_t ReadSingle();
|
||||
float ReadSingle();
|
||||
char ReadChar();
|
||||
std::string ReadString(uint32_t length);
|
||||
std::string ReadNString(int32_t maxLength = -1);
|
||||
|
||||
@ -51,7 +51,7 @@ namespace PKG
|
||||
|
||||
TexMipMap mipmap;
|
||||
|
||||
switch (container.ImageContainerVersion)
|
||||
switch (container.imageContainerVersion)
|
||||
{
|
||||
case ImageContainerVersion::VERSION1:
|
||||
mipmap = ReadMipMapV1(reader); break;
|
||||
@ -114,11 +114,11 @@ namespace PKG
|
||||
|
||||
int version = std::stoi(container.Magic.substr(4, 4));
|
||||
|
||||
container.ImageContainerVersion = (ImageContainerVersion)version;
|
||||
container.imageContainerVersion = (ImageContainerVersion)version;
|
||||
|
||||
if (container.ImageContainerVersion == ImageContainerVersion::VERSION4 && container.ImageFormat != FreeImageFormat::FIF_MP4)
|
||||
if (container.imageContainerVersion == ImageContainerVersion::VERSION4 && container.ImageFormat != FreeImageFormat::FIF_MP4)
|
||||
{
|
||||
container.ImageContainerVersion = ImageContainerVersion::VERSION3;
|
||||
container.imageContainerVersion = ImageContainerVersion::VERSION3;
|
||||
}
|
||||
|
||||
for (int i = 0; i < imageCount; i++)
|
||||
|
||||
@ -6,10 +6,14 @@
|
||||
#define CORE_H
|
||||
|
||||
#ifdef PKG_SHARED
|
||||
#ifdef PKG_BUILD_DLL
|
||||
#define PKG_API __declspec(dllexport)
|
||||
#ifdef __WIN32__
|
||||
#ifdef PKG_BUILD_DLL
|
||||
#define PKG_API __declspec(dllexport)
|
||||
#else
|
||||
#define PKG_API __declspec(dllimport)
|
||||
#endif
|
||||
#else
|
||||
#define PKG_API __declspec(dllimport)
|
||||
#define PKG_API
|
||||
#endif
|
||||
#else
|
||||
#define PKG_API
|
||||
|
||||
@ -22,7 +22,8 @@ namespace PKG
|
||||
public:
|
||||
std::string Magic;
|
||||
FreeImageFormat ImageFormat{};
|
||||
ImageContainerVersion ImageContainerVersion;
|
||||
// name conflict
|
||||
ImageContainerVersion imageContainerVersion;
|
||||
|
||||
std::vector<TexImage> Images;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user