archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-14 18:58:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #565 from boxingcow/master

Browse source 
Fix the OS X build fixes...
This commit is contained in:
Hykem 2014-07-14 12:03:57 +01:00
commit 17d400f72a
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/CMakeLists.txt
View file

@ -31,8 +31,8 @@ if (NOT MSVC)
endif() endif()
if (APPLE) if (APPLE)
set(CMAKE_CXX_FLAGS “${CMAKE_CXX_FLAGS} -I/opt/include/X11”) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/opt/X11/include")
set(CMAKE_C_FLAGS “${CMAKE_C_FLAGS} -I/opt/X11/include”) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I/opt/X11/include")
endif() endif()
If( NOT RPCS3_SRC_DIR) If( NOT RPCS3_SRC_DIR)

6
rpcs3/Emu/Memory/Memory.h
View file

@ -10,11 +10,7 @@
/* OS X uses MAP_ANON instead of MAP_ANONYMOUS */ /* OS X uses MAP_ANON instead of MAP_ANONYMOUS */
#ifndef MAP_ANONYMOUS #ifndef MAP_ANONYMOUS
#ifdef MAP_ANON #define MAP_ANONYMOUS MAP_ANON
#define MAP_ANONYMOUS MAP_ANON
#else
#define MAP_ANONYMOUS 0
#endif
#endif #endif
using std::nullptr_t; using std::nullptr_t;