archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 22:11:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small fixes to allow compililation on linux

Browse source
This commit is contained in:
Joshua Clark 2015-03-31 03:34:37 -05:00
parent 55b83af845
commit 10983338d8
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Utilities/rFile.cpp
View file

@ -127,7 +127,7 @@ bool rRename(const std::string &from, const std::string &to)
#ifdef _WIN32 #ifdef _WIN32
if (!MoveFile(ConvertUTF8ToWString(from).c_str(), ConvertUTF8ToWString(to).c_str())) if (!MoveFile(ConvertUTF8ToWString(from).c_str(), ConvertUTF8ToWString(to).c_str()))
#else #else
if (rename(from.c_str(), to.c_str())) if (int err = rename(from.c_str(), to.c_str()))
#endif #endif
{ {
LOG_ERROR(GENERAL, "Error renaming '%s' to '%s': 0x%llx", from.c_str(), to.c_str(), (u64)GET_API_ERROR); LOG_ERROR(GENERAL, "Error renaming '%s' to '%s': 0x%llx", from.c_str(), to.c_str(), (u64)GET_API_ERROR);

1
rpcs3/CMakeLists.txt
View file

@ -45,6 +45,7 @@ endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
#on some Linux distros shm_unlink and similar functions are in librt only #on some Linux distros shm_unlink and similar functions are in librt only
set(ADDITIONAL_LIBS "rt") set(ADDITIONAL_LIBS "rt")
set(ADDITIONAL_LIBS "X11")
elseif(UNIX) elseif(UNIX)
#it seems like glibc includes the iconv functions we use but other libc #it seems like glibc includes the iconv functions we use but other libc
#implementations like the one on OSX don't seem implement them #implementations like the one on OSX don't seem implement them