From 3c8084b2c7ea5c50f5db3eabddb1c41102faeeb8 Mon Sep 17 00:00:00 2001 From: boxingcow Date: Sun, 13 Jul 2014 09:31:11 +0100 Subject: [PATCH 1/3] Stupid mistake. --- rpcs3/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index c9b734be42..b194f4b87f 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -31,7 +31,7 @@ if (NOT MSVC) endif() 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”) endif() From 10647890ef5784b57adb737b14a4532201c30783 Mon Sep 17 00:00:00 2001 From: boxingcow Date: Sun, 13 Jul 2014 18:51:19 +0100 Subject: [PATCH 2/3] There is a special place in hell for 'Smart Dashes' --- rpcs3/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index b194f4b87f..896689a1e5 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -31,8 +31,8 @@ if (NOT MSVC) endif() if (APPLE) - set(CMAKE_CXX_FLAGS “${CMAKE_CXX_FLAGS} -I/opt/X11/include”) - set(CMAKE_C_FLAGS “${CMAKE_C_FLAGS} -I/opt/X11/include”) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/opt/X11/include") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I/opt/X11/include") endif() If( NOT RPCS3_SRC_DIR) From ebf713c5a69ed833f93beadf06b749a59b1e9776 Mon Sep 17 00:00:00 2001 From: boxingcow Date: Mon, 14 Jul 2014 09:18:45 +0100 Subject: [PATCH 3/3] Update Memory.h To remove extraneous code. --- rpcs3/Emu/Memory/Memory.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/rpcs3/Emu/Memory/Memory.h b/rpcs3/Emu/Memory/Memory.h index 4a10a3260a..effa1b88f7 100644 --- a/rpcs3/Emu/Memory/Memory.h +++ b/rpcs3/Emu/Memory/Memory.h @@ -10,11 +10,7 @@ /* OS X uses MAP_ANON instead of MAP_ANONYMOUS */ #ifndef MAP_ANONYMOUS - #ifdef MAP_ANON - #define MAP_ANONYMOUS MAP_ANON - #else - #define MAP_ANONYMOUS 0 - #endif + #define MAP_ANONYMOUS MAP_ANON #endif using std::nullptr_t;