mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-13 07:57:52 +00:00
- fixed a bunch of Linux and macOS compilation errors
This commit is contained in:
parent
e28d3b7f0b
commit
bfefc12427
5 changed files with 8 additions and 4 deletions
|
@ -41,6 +41,7 @@
|
|||
#include <stdint.h>
|
||||
#include <stdarg.h>
|
||||
#include <functional>
|
||||
#include <vector>
|
||||
#include "fs_swap.h"
|
||||
|
||||
#include "tarray.h"
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
*/
|
||||
|
||||
#include "fs_findfile.h"
|
||||
#include <string.h>
|
||||
#include <vector>
|
||||
|
||||
namespace FileSys {
|
||||
|
@ -175,7 +176,7 @@ static int FS_FindAttr(findstate_t *const fileinfo)
|
|||
std::string FS_FullPath(const char* directory)
|
||||
{
|
||||
// todo
|
||||
return directory
|
||||
return directory;
|
||||
}
|
||||
|
||||
static size_t FS_GetFileSize(findstate_t* handle, const char* pathname)
|
||||
|
|
|
@ -66,7 +66,7 @@ FImageSource *JPEGXLImage_TryCreate(FileReader & file, int lumpnum)
|
|||
{
|
||||
return nullptr;
|
||||
}
|
||||
JxlDecoderSetInput(jxlDecoderPtr, array.Data(), array.Size());
|
||||
JxlDecoderSetInput(jxlDecoderPtr, array.data(), array.size());
|
||||
JxlDecoderCloseInput(jxlDecoderPtr);
|
||||
|
||||
for (;;)
|
||||
|
@ -164,7 +164,7 @@ int FJPEGXLTexture::CopyPixels(FBitmap *bmp, int conversion)
|
|||
|
||||
auto lump = fileSystem.OpenFileReader(SourceLump);
|
||||
auto array = lump.Read();
|
||||
JxlDecoderSetInput(jxlDecoderPtr, array.Data(), array.Size());
|
||||
JxlDecoderSetInput(jxlDecoderPtr, array.data(), array.size());
|
||||
JxlDecoderCloseInput(jxlDecoderPtr);
|
||||
|
||||
for (;;)
|
||||
|
|
|
@ -40,6 +40,9 @@
|
|||
#include "i_system.h"
|
||||
#include "fs_findfile.h"
|
||||
|
||||
#ifdef __unix__
|
||||
#include <sys/stat.h>
|
||||
#endif // __unix__
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
|
|
|
@ -11,7 +11,6 @@ class AActor;
|
|||
class player_t;
|
||||
struct sector_t;
|
||||
class FCanvasTexture;
|
||||
class FileWriter;
|
||||
class DCanvas;
|
||||
struct FLevelLocals;
|
||||
class PClassActor;
|
||||
|
|
Loading…
Reference in a new issue