Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
parent b930b874fe ebf713c5a6
commit 17d400f72a
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/CMakeLists.txt
+2 -2
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)
rpcs3/Emu/Memory/Memory.h
+1 -5
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;