Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-30 10:06:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Mac OS X compilation, bug removed temporally the context access on Mac OS X, this is not necessary for any functionality right now.

Browse Source 
It was added for the PBuffer class, but i'll not implement PBuffers on Mac OS X until i understand how Carbon and Cocoa works, and i don't have direct access to a Mac OS X ( only from a VM, and works slow as a cart ).
Changed the platform name from Apple to Mac OS X ( i don't even know what i was thinking when a put Apple as a Platform :P ).
This commit is contained in:
spartanj
2010-08-25 01:47:33 -03:00
parent 66ead32bcc
commit bb8760ec42
11 changed files with 73 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/utils/utils.cpp
View File

@@ -1,7 +1,7 @@
#include "utils.hpp"
#include "string.hpp"
#if EE_PLATFORM == EE_PLATFORM_APPLE
#if EE_PLATFORM == EE_PLATFORM_MACOSX
#include <CoreFoundation/CoreFoundation.h>
#include <sys/sysctl.h>
#elif EE_PLATFORM == EE_PLATFORM_WIN32
@@ -45,7 +45,7 @@ void eeSleep( const Uint32& ms ) {
}
std::string AppPath() {
#if EE_PLATFORM == EE_PLATFORM_APPLE
#if EE_PLATFORM == EE_PLATFORM_MACOSX
char exe_file[PATH_MAX + 1];
CFBundleRef mainBundle = CFBundleGetMainBundle();
if (mainBundle) {
@@ -66,7 +66,7 @@ std::string AppPath() {
int size;
size = readlink("/proc/self/exe", exe_file, PATH_MAX);
if (size < 0) {
return "";
return "./";
} else {
exe_file[size] = '\0';
return std::string(dirname(exe_file)) + "/";
@@ -108,6 +108,9 @@ std::string AppPath() {
return std::string(szDrive) + std::string(szDir);
#endif
#else
#warning AppPath() not implemented on this platform. ( will return "./" )
return "./";
#endif
}
@@ -353,7 +356,7 @@ eeInt GetNumCPUs() {
nprocs = (eeInt) info.dwNumberOfProcessors;
#elif EE_PLATFORM == EE_PLATFORM_LINUX
nprocs = sysconf(_SC_NPROCESSORS_ONLN);
#elif EE_PLATFORM == EE_PLATFORM_APPLE
#elif EE_PLATFORM == EE_PLATFORM_MACOSX
int mib[2];
size_t len;
int maxproc = 1;
@@ -368,7 +371,7 @@ eeInt GetNumCPUs() {
nprocs = maxproc;
#else
#warning GetNumCPUs not implemented for this platform
#warning GetNumCPUs not implemented on this platform.
#endif
if ( nprocs < 0 )