mirror/blah
1
0
Fork 0
mirror of https://github.com/NoelFB/blah.git synced 2024-11-25 16:18:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from impiaaa/master

Browse Source 
Fixes for building on Linux
This commit is contained in:
Noel Berry 2021-01-03 23:15:38 -08:00 committed by GitHub
commit dd365d2c84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/internal/platform_backend_sdl2.cpp
View File

@ -166,6 +166,9 @@ uint64_t PlatformBackend::time()
return (uint64_t)SDL_GetTicks();
}
// Macro defined by X11 conflicts with MouseButton enum
#undef None
void PlatformBackend::frame()
{
// update the mouse every frame
@ -567,7 +570,9 @@ void PlatformBackend::dir_enumerate(Vector<FilePath>& list, const char* path, bo
if (dp->d_name[0] == '.')
continue;
FilePath subpath = FilePath(path).append(dp->d_name);
FilePath subpath = FilePath(path);
if (subpath.end()[-1] != '/') subpath = subpath.append("/");
subpath = subpath.append(dp->d_name);
list.push_back(subpath);
if (recursive && dp->d_type == DT_DIR)