ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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.
This commit is contained in:
rogerman 2013-11-03 03:21:26 +00:00
parent 79e97e339e
commit b2b3a14b63
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/arm_jit.h
View File

@ -31,7 +31,7 @@ void arm_jit_close();
void arm_jit_sync(); void arm_jit_sync();
template<int PROCNUM> u32 arm_jit_compile(); 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 #define MAPPED_JIT_FUNCS
#endif #endif
#ifdef MAPPED_JIT_FUNCS #ifdef MAPPED_JIT_FUNCS

1
desmume/src/cocoa/DeSmuME_Prefix.pch
View File

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

1
desmume/src/cocoa/openemu/DeSmuME_Prefix_OpenEmu.pch
View File

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

6
desmume/src/path.h
View File

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

13
desmume/src/types.h
View File

@ -19,16 +19,17 @@
#ifndef TYPES_HPP #ifndef TYPES_HPP
#define 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 //analyze microsoft compilers
#ifdef _MSC_VER #ifdef _MSC_VER
#define HOST_WINDOWS #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 //todo - everyone will want to support this eventually, i suppose
#include "config.h" #include "config.h"

2
desmume/src/version.cpp
View File

@ -32,7 +32,7 @@
#endif #endif
//todo - everyone will want to support this eventually, i suppose //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" #include "svnrev.h"
#else #else
#ifdef SVN_REV #ifdef SVN_REV