diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp index e0a3fe860..3bebbe77f 100644 --- a/Common/FileUtil.cpp +++ b/Common/FileUtil.cpp @@ -713,6 +713,8 @@ std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath) #ifdef _WIN32 // TODO: use GetExeDirectory() here instead of ROOT_DIR so that if the cwd is changed we still have the correct paths? paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP; +#elif defined(__SYMBIAN32__) + paths[D_USER_IDX] = "E:" DIR_SEP "PPSSPP" DIR_SEP; #else if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR)) paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP; diff --git a/Common/MemoryUtil.cpp b/Common/MemoryUtil.cpp index 2a4d74a46..282ffe2ee 100644 --- a/Common/MemoryUtil.cpp +++ b/Common/MemoryUtil.cpp @@ -55,6 +55,7 @@ void* AllocateExecutableMemory(size_t size, bool low) void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); #elif defined(__SYMBIAN32__) // On Symbian, we will need to create an RChunk and allocate with ->CreateLocalCode(size, size); + static char *map_hint = 0; void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE, -1, 0); #else static char *map_hint = 0; diff --git a/Qt/Settings.pri b/Qt/Settings.pri index 5db0598e9..87d3a408e 100644 --- a/Qt/Settings.pri +++ b/Qt/Settings.pri @@ -1,5 +1,5 @@ blackberry|symbian: CONFIG += mobile_platform -unix:!blackberry:!macx: CONFIG += linux +unix:!blackberry:!symbian:!macx: CONFIG += linux # Global specific QMAKE_CXXFLAGS += -std=c++0x -Wno-unused-function -Wno-unused-variable -Wno-multichar -Wno-uninitialized -Wno-ignored-qualifiers -Wno-missing-field-initializers -Wno-unused-parameter diff --git a/android/jni/NativeApp.cpp b/android/jni/NativeApp.cpp index 4b749797c..251a98a53 100644 --- a/android/jni/NativeApp.cpp +++ b/android/jni/NativeApp.cpp @@ -219,7 +219,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co #endif } -#if defined(ANDROID) || defined(BLACKBERRY) +#if defined(ANDROID) || defined(BLACKBERRY) || defined(__SYMBIAN32__) g_Config.memCardDirectory = user_data_path; g_Config.flashDirectory = user_data_path+"/flash/"; #else