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

Merge pull request #1053 from Bigpet/cmake_err

Browse source 
Stop overwriting the ADDITIONAL_LIBS setting for CMake.
This commit is contained in:
Hykem 2015-04-11 13:09:19 +01:00
commit 18b8a7d473
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rpcs3/CMakeLists.txt
View file

@ -44,8 +44,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" "X11")
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