Buildfixes

This commit is contained in:
Henrik Rydgard 2015-09-23 10:25:41 +02:00
parent 58d3137b10
commit dc05a6516e
3 changed files with 8 additions and 12 deletions

View file

@ -339,9 +339,9 @@ void NativeInit(int argc, const char *argv[],
// On Android, create a PSP directory tree in the external_directory,
// to hopefully reduce confusion a bit.
ILOG("Creating %s", (g_Config.memStickDirectory + "PSP").c_str());
mkDir((g_Config.memStickDirectory + "PSP").c_str());
mkDir((g_Config.memStickDirectory + "PSP/SAVEDATA").c_str());
mkDir((g_Config.memStickDirectory + "PSP/GAME").c_str());
File::CreateDir((g_Config.memStickDirectory + "PSP").c_str());
File::CreateDir((g_Config.memStickDirectory + "PSP/SAVEDATA").c_str());
File::CreateDir((g_Config.memStickDirectory + "PSP/GAME").c_str());
#endif
const char *fileToLog = 0;

View file

@ -36,6 +36,11 @@
#include <zlib.h>
// Symbian is nuts
#if !defined(_WIN32) && defined(UNICODE)
#undef UNICODE
#endif
#ifdef _MSC_VER
#define ZIP_EXTERN
#define fseeko fseek

View file

@ -144,12 +144,6 @@ bool readDataFromFile(bool text_file, unsigned char* &data, const unsigned int s
return true;
}
#define DIR_SEP "/"
#define DIR_SEP_CHR '\\'
#ifndef METRO
// Returns true if filename is a directory
bool isDirectory(const std::string &filename) {
FileInfo info;
@ -177,7 +171,6 @@ bool getFileInfo(const char *path, FileInfo *fileInfo) {
struct stat64 file_info;
std::string copy(path);
stripTailDirSlashes(copy);
int result = stat64(copy.c_str(), &file_info);
@ -316,8 +309,6 @@ size_t getFilesInDir(const char *directory, std::vector<FileInfo> *files, const
return foundEntries;
}
#endif
std::string getDir(const std::string &path)
{
if (path == "/")