Revert some changes for now to fix the build with the older vitasdk (…

…since the new one has some IO performance regression)
Northfear · Dec 23, 2023 · 9a63b69 · 9a63b69
1 parent 379721e
commit 9a63b69
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/common/file_posix.cpp b/common/file_posix.cpp
@@ -9,7 +9,6 @@
 #include <fnmatch.h>
 
 #ifdef __vita__
-#include <psp2/io/stat.h>
 #include <algorithm>
 #include <string>
 #include <vector>
@@ -118,12 +117,6 @@ bool Find_File_Data_Posix::FindNextWithFilter()
         if (DirEntry == nullptr) {
             return false;
         }
-#ifdef __vita__
-        // this makes file search on init slower, but RA fails otherwise because files sneak in here for some reason
-        if (SCE_S_ISDIR(DirEntry->d_stat.st_mode)) {
-            continue;
-        }
-#endif
         if (fnmatch(FileFilter, DirEntry->d_name, FNM_PATHNAME | FNM_CASEFOLD) == 0) {
             strcpy(FullName, DirName);
             strcat(FullName, DirEntry->d_name);

diff --git a/common/mixfile.h b/common/mixfile.h
@@ -36,6 +36,14 @@
 
 #ifdef __vita__
 #define PATH_MAX 256
+#define basename basename_vita
+
+// fails to link due to undefined basename. old newlib?
+static char* basename_vita(const char* filename)
+{
+    char* p = strrchr(filename, '/');
+    return p ? p + 1 : (char*)filename;
+}
 #endif
 
 #ifndef _MAX_PATH

diff --git a/common/paths_vita.cpp b/common/paths_vita.cpp
@@ -24,7 +24,7 @@
 
 #define PATH_MAX 256
 
-#include <psp2/io/stat.h>
+#include <psp2/io/dirent.h>
 
 std::string vitaGamePath;