diff --git a/src/main.cpp b/src/main.cpp index 45df303a..b2a12a8e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -10,11 +10,7 @@ #include -#if defined(ARCH_WIN) - #include -#else - #include -#endif +#include using namespace rack; @@ -22,31 +18,17 @@ using namespace rack; std::vector filesystemListDirectory(std::string path) { std::vector filenames; -#if defined(ARCH_WIN) - WIN32_FIND_DATA findData; - HANDLE findHandle = FindFirstFile((path + "/*").c_str(), &findData); - if (findHandle != INVALID_HANDLE_VALUE) { - do { - std::string filename = findData.cFileName; - if (filename == "." || filename == "..") - continue; - filenames.push_back(path + "/" + filename); - } while (FindNextFile(findHandle, &findData)); - FindClose(findHandle); - } -#else DIR *dir = opendir(path.c_str()); if (dir) { struct dirent *d; while ((d = readdir(dir))) { - std::string filename = d->f_name; + std::string filename = d->d_name; if (filename == "." || filename == "..") continue; filenames.push_back(path + "/" + filename); } closedir(dir); } -#endif return filenames; }