- Fix compiling for OS X Cocoa port and some other platforms. (Regression from r4821.)

- Since DeSmuME on OS X can be built for both Cocoa and CLI, revert some naming changes from r4821 for the Cocoa port specific features.

desmume/src/arm_jit.h

@@ -31,7 +31,7 @@ void arm_jit_close();
 void arm_jit_sync();
 template<int PROCNUM> u32 arm_jit_compile();
 
-#if defined(HOST_WINDOWS) || defined(HOST_DARWIN)
+#if defined(HOST_WINDOWS) || defined(DESMUME_COCOA)
 #define MAPPED_JIT_FUNCS
 #endif
 #ifdef MAPPED_JIT_FUNCS

desmume/src/cocoa/DeSmuME_Prefix.pch

@@ -20,6 +20,7 @@
 	#define OBJ_C
 #endif
 
+#define HOST_DARWIN
 #define DESMUME_COCOA
 #define HAVE_OPENGL
 #define HAVE_LIBZ

desmume/src/cocoa/openemu/DeSmuME_Prefix_OpenEmu.pch

@@ -19,6 +19,7 @@
 	#define OBJ_C
 #endif
 
+#define HOST_DARWIN
 #define DESMUME_COCOA
 #define HAVE_OPENGL
 #define HAVE_LIBZ

desmume/src/path.h

@@ -28,7 +28,7 @@
 #include "winutil.h"
 #include "common.h"
 #include "resource.h"
-#elif !defined(HOST_DARWIN)
+#elif !defined(DESMUME_COCOA)
 #include <glib.h>
 #endif /* HOST_WINDOWS */
 
@@ -126,7 +126,7 @@ public:
 		std::vector<std::string> parts = tokenize_str(filename,"|");
 		SetRomName(parts[parts.size()-1].c_str());
 		LoadModulePath();
-#if !defined(WIN32) && !defined(HOST_DARWIN)
+#if !defined(WIN32) && !defined(DESMUME_COCOA)
 		ReadPathSettings();
 #endif
 		
@@ -149,7 +149,7 @@ public:
 		{
 			strcpy(pathToModule,_hack_alternateModulePath);
 		}
-#elif defined(HOST_DARWIN)
+#elif defined(DESMUME_COCOA)
 		std::string pathStr = Path::GetFileDirectoryPath(path);
 
 		strncpy(pathToModule, pathStr.c_str(), MAX_PATH);

desmume/src/types.h

@@ -19,16 +19,17 @@
 #ifndef TYPES_HPP
 #define TYPES_HPP
 
+// Determine CPU architecture
+#if defined(__x86_64__) || defined(__LP64) || defined(__IA64__) || defined(_M_X64) || defined(_WIN64)
+	#define HOST_64
+#else
+	#define HOST_32
+#endif
+
 //analyze microsoft compilers
 #ifdef _MSC_VER
 	#define HOST_WINDOWS
 	
-	#if defined(__x86_64__) || defined(__LP64) || defined(__IA64__) || defined(_M_X64) || defined(_WIN64) 
-		#define HOST_64
-	#else
-		#define HOST_32
-	#endif
-	
 	//todo - everyone will want to support this eventually, i suppose
 	#include "config.h"
 

desmume/src/version.cpp

@@ -32,7 +32,7 @@
 #endif
 
 //todo - everyone will want to support this eventually, i suppose
-#if defined(HOST_WINDOWS) || defined(HOST_DARWIN)
+#if defined(HOST_WINDOWS) || defined(DESMUME_COCOA)
 	#include "svnrev.h"
 #else
 	#ifdef SVN_REV