Merge pull request #562 from boxingcow/master

Fix OS X build

.gitignore

@@ -64,3 +64,5 @@ rpcs3/git-version.h
 bin/dev_hdd0/log.txt
 x64/Debug/emucore.lib
 x64/Release/emucore.lib
+
+.DS_Store

rpcs3/CMakeLists.txt

@@ -30,6 +30,11 @@ if (NOT MSVC)
 	add_definitions(-msse2)
 endif()
 
+if (APPLE)
+	set(CMAKE_CXX_FLAGS “${CMAKE_CXX_FLAGS} -I/opt/include/X11”)
+	set(CMAKE_C_FLAGS “${CMAKE_C_FLAGS} -I/opt/X11/include”)
+endif()
+
 If( NOT RPCS3_SRC_DIR)
   SET(RPCS3_SRC_DIR ${CMAKE_CURRENT_LIST_DIR})
   Message("-- Initializing RPCS3_SRC_DIR=${RPCS3_SRC_DIR}")

rpcs3/Emu/Cell/PPUThread.cpp

@@ -4,11 +4,13 @@
 #include "Emu/System.h"
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/SysCalls/Modules.h"
-
 #include "Emu/Cell/PPUDecoder.h"
 #include "Emu/Cell/PPUInterpreter.h"
 #include "Emu/Cell/PPUDisAsm.h"
+
 #include <thread>
+#include <cmath>
+
 extern gcmInfo gcm_info;
 
 PPUThread& GetCurrentPPUThread()
@@ -190,7 +192,7 @@ bool FPRdouble::IsINF(PPCdouble d)
 
 bool FPRdouble::IsNaN(PPCdouble d)
 {
-	return isnan(d) ? 1 : 0;
+	return std::isnan((double)d) ? 1 : 0;
 }
 
 bool FPRdouble::IsQNaN(PPCdouble d)

rpcs3/Emu/Memory/Memory.h

@@ -8,6 +8,15 @@
 #include "Emu/SysCalls/Callback.h"
 #include <vector>
 
+/* 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
+#endif
+
 using std::nullptr_t;
 
 #define safe_delete(x) do {delete (x);(x)=nullptr;} while(0)