mingw-64 compilation fix
This commit is contained in:
Vadim Grigoruk committed
1 parent
617dc01479
commit
4d08ad0cf8
2 files changed
+43
-51
No files matched your search
@@ -131,8 +131,6 @@ static const char* stringToUtf8(const fsString* wstr)
|
||||
|
||||
#define freeString(S) free((void*)S)
|
||||
|
||||
FILE* _wfopen(const fsString *, const fsString *);
|
||||
int _wremove(const fsString *);
|
||||
|
||||
#define TIC_DIR _WDIR
|
||||
#define tic_dirent _wdirent
|
||||
@@ -146,6 +144,8 @@ int _wremove(const fsString *);
|
||||
#define tic_remove _wremove
|
||||
#define tic_fopen _wfopen
|
||||
#define tic_mkdir(name) _wmkdir(name)
|
||||
#define tic_strcpy wcscpy
|
||||
#define tic_strcat wcscat
|
||||
|
||||
#else
|
||||
|
||||
@@ -170,6 +170,8 @@ typedef char fsString;
|
||||
#define tic_remove remove
|
||||
#define tic_fopen fopen
|
||||
#define tic_mkdir(name) mkdir(name, 0700)
|
||||
#define tic_strcpy strcpy
|
||||
#define tic_strcat strcat
|
||||
|
||||
#endif
|
||||
|
||||
@@ -298,6 +300,42 @@ static void netDirRequest(const char* path, ListCallback callback, void* data)
|
||||
|
||||
#endif
|
||||
|
||||
static void enumFiles(FileSystem* fs, const char* path, ListCallback callback, void* data, bool folder)
|
||||
{
|
||||
TIC_DIR *dir = NULL;
|
||||
struct tic_dirent* ent = NULL;
|
||||
|
||||
const fsString* pathString = utf8ToString(path);
|
||||
|
||||
if ((dir = tic_opendir(pathString)) != NULL)
|
||||
{
|
||||
fsString fullPath[FILENAME_MAX];
|
||||
struct tic_stat_struct s;
|
||||
|
||||
while ((ent = tic_readdir(dir)) != NULL)
|
||||
{
|
||||
if(*ent->d_name != _S('.'))
|
||||
{
|
||||
tic_strcpy(fullPath, pathString);
|
||||
tic_strcat(fullPath, ent->d_name);
|
||||
|
||||
if(tic_stat(fullPath, &s) == 0 && folder ? S_ISDIR(s.st_mode) : S_ISREG(s.st_mode))
|
||||
{
|
||||
const char* name = stringToUtf8(ent->d_name);
|
||||
bool result = callback(name, NULL, 0, data, folder);
|
||||
freeString(name);
|
||||
|
||||
if(!result) break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tic_closedir(dir);
|
||||
}
|
||||
|
||||
freeString(pathString);
|
||||
}
|
||||
|
||||
void fsEnumFiles(FileSystem* fs, ListCallback callback, void* data)
|
||||
{
|
||||
#if !defined(__EMSCRIPTEN__)
|
||||
@@ -312,56 +350,10 @@ void fsEnumFiles(FileSystem* fs, ListCallback callback, void* data)
|
||||
|
||||
#endif
|
||||
|
||||
TIC_DIR *dir = NULL;
|
||||
struct tic_dirent* ent = NULL;
|
||||
|
||||
const char* path = getFilePath(fs, "");
|
||||
|
||||
{
|
||||
const fsString* pathString = utf8ToString(path);
|
||||
|
||||
if ((dir = tic_opendir(pathString)) != NULL)
|
||||
{
|
||||
while ((ent = tic_readdir(dir)) != NULL)
|
||||
{
|
||||
if (ent->d_type == DT_DIR && *ent->d_name != _S('.'))
|
||||
{
|
||||
const char* name = stringToUtf8(ent->d_name);
|
||||
bool result = callback(name, NULL, 0, data, true);
|
||||
freeString(name);
|
||||
|
||||
if(!result) break;
|
||||
}
|
||||
}
|
||||
|
||||
tic_closedir(dir);
|
||||
}
|
||||
|
||||
freeString(pathString);
|
||||
}
|
||||
|
||||
{
|
||||
const fsString* pathString = utf8ToString(path);
|
||||
|
||||
if ((dir = tic_opendir(pathString)) != NULL)
|
||||
{
|
||||
while ((ent = tic_readdir(dir)) != NULL)
|
||||
{
|
||||
if (ent->d_type == DT_REG)
|
||||
{
|
||||
const char* name = stringToUtf8(ent->d_name);
|
||||
bool result = callback(name, NULL, 0, data, false);
|
||||
freeString(name);
|
||||
|
||||
if (!result)break;
|
||||
}
|
||||
}
|
||||
|
||||
tic_closedir(dir);
|
||||
}
|
||||
|
||||
freeString(pathString);
|
||||
}
|
||||
enumFiles(fs, path, callback, data, true);
|
||||
enumFiles(fs, path, callback, data, false);
|
||||
}
|
||||
|
||||
bool fsDeleteDir(FileSystem* fs, const char* name)
|
||||
|
||||
+1
-1
@@ -77,7 +77,7 @@ tic80* tic80_create(s32 samplerate)
|
||||
|
||||
{
|
||||
static const u8 Font[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x30, 0x00, 0x30, 0x00, 0x00, 0x00, 0x50, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf8, 0x50, 0xf8, 0x50, 0x00, 0x00, 0x00, 0x78, 0xa0, 0x70, 0x28, 0xf0, 0x00, 0x00, 0x00, 0x88, 0x10, 0x20, 0x40, 0x88, 0x00, 0x00, 0x00, 0x40, 0xa0, 0x68, 0x90, 0x68, 0x00, 0x00, 0x00, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x40, 0x40, 0x40, 0x20, 0x00, 0x00, 0x00, 0x40, 0x20, 0x20, 0x20, 0x40, 0x00, 0x00, 0x00, 0x20, 0xa8, 0x70, 0xa8, 0x20, 0x00, 0x00, 0x00, 0x00, 0x20, 0x70, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x70, 0xc8, 0xc8, 0xc8, 0x70, 0x00, 0x00, 0x00, 0x30, 0x70, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0xf0, 0x18, 0x70, 0xc0, 0xf8, 0x00, 0x00, 0x00, 0xf8, 0x18, 0x30, 0x98, 0x70, 0x00, 0x00, 0x00, 0x30, 0x70, 0xd0, 0xf8, 0x10, 0x00, 0x00, 0x00, 0xf8, 0xc0, 0xf0, 0x18, 0xf0, 0x00, 0x00, 0x00, 0x70, 0xc0, 0xf0, 0xc8, 0x70, 0x00, 0x00, 0x00, 0xf8, 0x18, 0x30, 0x60, 0xc0, 0x00, 0x00, 0x00, 0x70, 0xc8, 0x70, 0xc8, 0x70, 0x00, 0x00, 0x00, 0x70, 0xc8, 0x78, 0x08, 0x70, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x20, 0x40, 0x00, 0x00, 0x10, 0x20, 0x40, 0x20, 0x10, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x10, 0x20, 0x40, 0x00, 0x00, 0x00, 0x78, 0x18, 0x30, 0x00, 0x30, 0x00, 0x00, 0x00, 0x70, 0xa8, 0xb8, 0x80, 0x70, 0x00, 0x00, 0x00, 0x70, 0xc8, 0xc8, 0xf8, 0xc8, 0x00, 0x00, 0x00, 0xf0, 0xc8, 0xf0, 0xc8, 0xf0, 0x00, 0x00, 0x00, 0x70, 0xc8, 0xc0, 0xc8, 0x70, 0x00, 0x00, 0x00, 0xf0, 0xc8, 0xc8, 0xc8, 0xf0, 0x00, 0x00, 0x00, 0xf8, 0xc0, 0xf0, 0xc0, 0xf8, 0x00, 0x00, 0x00, 0xf8, 0xc0, 0xf0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x78, 0xc0, 0xd8, 0xc8, 0x78, 0x00, 0x00, 0x00, 0xc8, 0xc8, 0xf8, 0xc8, 0xc8, 0x00, 0x00, 0x00, 0x78, 0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0xf8, 0x18, 0x18, 0xd8, 0x70, 0x00, 0x00, 0x00, 0xc8, 0xd0, 0xe0, 0xd0, 0xc8, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xf8, 0x00, 0x00, 0x00, 0xd8, 0xf8, 0xf8, 0xa8, 0x88, 0x00, 0x00, 0x00, 0xc8, 0xe8, 0xf8, 0xd8, 0xc8, 0x00, 0x00, 0x00, 0x70, 0xc8, 0xc8, 0xc8, 0x70, 0x00, 0x00, 0x00, 0xf0, 0xc8, 0xc8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x70, 0xc8, 0xc8, 0xc8, 0x70, 0x08, 0x00, 0x00, 0xf0, 0xc8, 0xc8, 0xf0, 0xc8, 0x00, 0x00, 0x00, 0x78, 0xe0, 0x70, 0x38, 0xf0, 0x00, 0x00, 0x00, 0x78, 0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0xc8, 0xc8, 0xc8, 0xc8, 0x70, 0x00, 0x00, 0x00, 0xc8, 0xc8, 0xc8, 0x70, 0x20, 0x00, 0x00, 0x00, 0x88, 0xa8, 0xf8, 0xf8, 0xd8, 0x00, 0x00, 0x00, 0xc8, 0xc8, 0x70, 0xc8, 0xc8, 0x00, 0x00, 0x00, 0x68, 0x68, 0x78, 0x30, 0x30, 0x00, 0x00, 0x00, 0xf8, 0x30, 0x60, 0xc0, 0xf8, 0x00, 0x00, 0x00, 0x60, 0x40, 0x40, 0x40, 0x60, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x00, 0x00, 0x00, 0x60, 0x20, 0x20, 0x20, 0x60, 0x00, 0x00, 0x00, 0x20, 0x50, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x98, 0x98, 0x78, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xc8, 0xc8, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x78, 0xe0, 0xe0, 0x78, 0x00, 0x00, 0x00, 0x18, 0x78, 0x98, 0x98, 0x78, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0xe0, 0x70, 0x00, 0x00, 0x00, 0x38, 0x60, 0xf8, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x70, 0x98, 0xf8, 0xLine truncated
|
||||
memcpy(tic80->memory->font.data, Font, sizeof(tic_font));
|
||||
memcpy(tic80->memory->font.data, Font, sizeof Font);
|
||||
}
|
||||
|
||||
return &tic80->tic;
|
||||
|
||||
Reference in new issue
Block a user