- fixed a bunch of Linux and macOS compilation errors

This commit is contained in:
alexey.lysiuk 2023-08-23 11:47:54 +03:00
parent e28d3b7f0b
commit bfefc12427
5 changed files with 8 additions and 4 deletions

View file

@ -41,6 +41,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdarg.h> #include <stdarg.h>
#include <functional> #include <functional>
#include <vector>
#include "fs_swap.h" #include "fs_swap.h"
#include "tarray.h" #include "tarray.h"

View file

@ -33,6 +33,7 @@
*/ */
#include "fs_findfile.h" #include "fs_findfile.h"
#include <string.h>
#include <vector> #include <vector>
namespace FileSys { namespace FileSys {
@ -175,7 +176,7 @@ static int FS_FindAttr(findstate_t *const fileinfo)
std::string FS_FullPath(const char* directory) std::string FS_FullPath(const char* directory)
{ {
// todo // todo
return directory return directory;
} }
static size_t FS_GetFileSize(findstate_t* handle, const char* pathname) static size_t FS_GetFileSize(findstate_t* handle, const char* pathname)

View file

@ -66,7 +66,7 @@ FImageSource *JPEGXLImage_TryCreate(FileReader & file, int lumpnum)
{ {
return nullptr; return nullptr;
} }
JxlDecoderSetInput(jxlDecoderPtr, array.Data(), array.Size()); JxlDecoderSetInput(jxlDecoderPtr, array.data(), array.size());
JxlDecoderCloseInput(jxlDecoderPtr); JxlDecoderCloseInput(jxlDecoderPtr);
for (;;) for (;;)
@ -164,7 +164,7 @@ int FJPEGXLTexture::CopyPixels(FBitmap *bmp, int conversion)
auto lump = fileSystem.OpenFileReader(SourceLump); auto lump = fileSystem.OpenFileReader(SourceLump);
auto array = lump.Read(); auto array = lump.Read();
JxlDecoderSetInput(jxlDecoderPtr, array.Data(), array.Size()); JxlDecoderSetInput(jxlDecoderPtr, array.data(), array.size());
JxlDecoderCloseInput(jxlDecoderPtr); JxlDecoderCloseInput(jxlDecoderPtr);
for (;;) for (;;)

View file

@ -40,6 +40,9 @@
#include "i_system.h" #include "i_system.h"
#include "fs_findfile.h" #include "fs_findfile.h"
#ifdef __unix__
#include <sys/stat.h>
#endif // __unix__
//========================================================================== //==========================================================================
// //

View file

@ -11,7 +11,6 @@ class AActor;
class player_t; class player_t;
struct sector_t; struct sector_t;
class FCanvasTexture; class FCanvasTexture;
class FileWriter;
class DCanvas; class DCanvas;
struct FLevelLocals; struct FLevelLocals;
class PClassActor; class PClassActor;