diff --git a/CMakeLists.txt b/CMakeLists.txt index af9fa18b2..aef78a4ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(OpenSpades) set(OpenSpades_VERSION_MAJOR 0) set(OpenSpades_VERSION_MINOR 0) -set(OpenSpades_VERSION_REVISION 10) +set(OpenSpades_VERSION_REVISION 11) set(OS_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/Sources/Audio/YsrDevice.cpp b/Sources/Audio/YsrDevice.cpp index e979f0a20..c86db3753 100644 --- a/Sources/Audio/YsrDevice.cpp +++ b/Sources/Audio/YsrDevice.cpp @@ -33,7 +33,7 @@ #if defined(__APPLE__) SPADES_SETTING(s_ysrDriver, "libysrspades.dylib"); #elif defined(WIN32) -SPADES_SETTING(s_ysrDriver, "YSR for OpenSpades.dll"); +SPADES_SETTING(s_ysrDriver, "YSRSpades.dll"); #else SPADES_SETTING(s_ysrDriver, "libysrspades.so"); #endif diff --git a/Sources/Core/FltkPreferenceImporter.cpp b/Sources/Core/FltkPreferenceImporter.cpp index bd0243bcd..fca4cc677 100644 --- a/Sources/Core/FltkPreferenceImporter.cpp +++ b/Sources/Core/FltkPreferenceImporter.cpp @@ -46,7 +46,7 @@ namespace spades { #ifdef WIN32 static std::wstring Utf8ToWString(const char *s) { auto *ws = (WCHAR*)SDL_iconv_string("UCS-2-INTERNAL", "UTF-8", (char *)(s), SDL_strlen(s)+1); - if(ws) return ""L; + if(!ws) return L""; std::wstring wss(ws); SDL_free(ws); return wss; @@ -141,7 +141,7 @@ namespace spades { SPLog("Moving %s to %s", path.c_str(), (path + "-old").c_str()); #ifdef WIN32 auto s = Utf8ToWString(path.c_str()); - Move(s.c_str(), (s + "-old"L).c_str()); + MoveFileW(s.c_str(), (s + L"-old").c_str()); #else rename(path.c_str(), (path + "-old").c_str()); #endif