From 6fa8adc1702a47a57fa5e50e692362d76ce623e1 Mon Sep 17 00:00:00 2001 From: foxblock Date: Mon, 9 Sep 2024 18:10:44 +0200 Subject: [PATCH] Move FILTER_FOLDER define to internals of rcore and document option in comment --- src/raylib.h | 6 +----- src/rcore.c | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/raylib.h b/src/raylib.h index b55f91d71..15e15f3ee 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -194,10 +194,6 @@ #define MAGENTA CLITERAL(Color){ 255, 0, 255, 255 } // Magenta #define RAYWHITE CLITERAL(Color){ 245, 245, 245, 255 } // My own White (raylib logo) -// Filter string used in ScanDirectoryFiles, ScanDirectoryFilesRecursively and -// LoadDirectoryFilesEx to include directories in the result array -#define FILTER_FOLDER "/DIR" - //---------------------------------------------------------------------------------- // Structures Definition //---------------------------------------------------------------------------------- @@ -1130,7 +1126,7 @@ RLAPI bool ChangeDirectory(const char *dir); // Change work RLAPI bool IsPathFile(const char *path); // Check if a given path is a file or a directory RLAPI bool IsFileNameValid(const char *fileName); // Check if fileName is valid for the platform/OS RLAPI FilePathList LoadDirectoryFiles(const char *dirPath); // Load directory filepaths -RLAPI FilePathList LoadDirectoryFilesEx(const char *basePath, const char *filter, bool scanSubdirs); // Load directory filepaths with extension filtering and recursive directory scan +RLAPI FilePathList LoadDirectoryFilesEx(const char *basePath, const char *filter, bool scanSubdirs); // Load directory filepaths with extension filtering and recursive directory scan. Use "/DIR" in the filter string to include directories in the result RLAPI void UnloadDirectoryFiles(FilePathList files); // Unload filepaths RLAPI bool IsFileDropped(void); // Check if a file has been dropped into window RLAPI FilePathList LoadDroppedFiles(void); // Load dropped filepaths diff --git a/src/rcore.c b/src/rcore.c index ebf1c67e1..a1fffd0cf 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -247,6 +247,10 @@ unsigned int __stdcall timeEndPeriod(unsigned int uPeriod); #define MAX_AUTOMATION_EVENTS 16384 // Maximum number of automation events to record #endif +#ifndef FILTER_FOLDER + #define FILTER_FOLDER "/DIR" // Filter string used in ScanDirectoryFiles, ScanDirectoryFilesRecursively and LoadDirectoryFilesEx to include directories in the result array +#endif + // Flags operation macros #define FLAG_SET(n, f) ((n) |= (f)) #define FLAG_CLEAR(n, f) ((n) &= ~(f))