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

Fixed mutex on HaikuTTF.

Browse Source 
Fixed the texture font loader, that for some reason i was forcing the threaded loading.
This commit is contained in:
spartanj
2011-02-20 17:34:44 -03:00
parent 6c6c3f148d
commit 54fb10c92b
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/ctexturefontloader.cpp
View File

@@ -67,7 +67,7 @@ cTextureFontLoader::~cTextureFontLoader() {
void cTextureFontLoader::Start() {
cObjectLoader::Start();
mTexLoader->Threaded( true );
mTexLoader->Threaded( mThreaded );
mTexLoader->Load();
if ( !mThreaded )

25
src/helper/haikuttf/hkbase.hpp
View File

@@ -17,17 +17,26 @@ typedef SOPHIST_uint32 u32;
#define HK_PLATFORM_WIN (1)
#define HK_PLATFORM_LINUX (2)
#define HK_PLATFORM_MACOSX (3)
#define HK_PLATFORM_BSD (4)
#define HK_PLATFORM_SOLARIS (5)
#define HK_PLATFORM_HAIKU (6)
#if defined( __WIN32__ ) || defined( _WIN32 ) || defined( _WIN64 )
# define HK_PLATFORM HK_PLATFORM_WIN
#elif defined( __APPLE_CC__) || defined ( __APPLE__ )
# define HK_PLATFORM HK_PLATFORM_MACOSX
#elif defined( LINUX ) || defined( __linux__ )
# define HK_PLATFORM HK_PLATFORM_LINUX
#define HK_PLATFORM HK_PLATFORM_WIN
#elif defined( __APPLE_CC__ ) || defined ( __APPLE__ )
#define HK_PLATFORM HK_PLATFORM_MACOSX
#elif defined ( linux ) || defined( __linux__ )
#define HK_PLATFORM HK_PLATFORM_LINUX
#elif defined( __FreeBSD__ ) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined( __DragonFly__ )
#define HK_PLATFORM HK_PLATFORM_BSD
#elif defined( __SVR4 )
#define HK_PLATFORM HK_PLATFORM_SOLARIS
#elif defined( __HAIKU__ ) || defined( __BEOS__ )
#define HK_PLATFORM HK_PLATFORM_HAIKU
#endif
#if HK_PLATFORM == HK_PLATFORM_LINUX || HK_PLATFORM == HK_PLATFORM_MACOSX
#define HK_PLATFORM_UNIX
#if defined ( linux ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined( __DragonFly__ ) || defined( __SVR4 ) || defined( __APPLE_CC__ ) || defined ( __APPLE__ ) || defined( __HAIKU__ ) || defined( __BEOS__ )
#define HK_PLATFORM_POSIX
#endif
#if HK_PLATFORM == HK_PLATFORM_WIN
@@ -35,7 +44,7 @@ typedef SOPHIST_uint32 u32;
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#elif defined( HK_PLATFORM_UNIX )
#elif defined( HK_PLATFORM_POSIX )
#include <pthread.h>
#endif

8
src/helper/haikuttf/hkmutex.cpp
View File

@@ -5,7 +5,7 @@ namespace HaikuTTF {
hkMutex::hkMutex() {
#if HK_PLATFORM == HK_PLATFORM_WIN
InitializeCriticalSection(&mMutex);
#elif defined( HK_PLATFORM_UNIX )
#elif defined( HK_PLATFORM_POSIX )
pthread_mutex_init(&mMutex, NULL);
#endif
}
@@ -13,7 +13,7 @@ hkMutex::hkMutex() {
hkMutex::~hkMutex() {
#if HK_PLATFORM == HK_PLATFORM_WIN
DeleteCriticalSection(&mMutex);
#elif defined( HK_PLATFORM_UNIX )
#elif defined( HK_PLATFORM_POSIX )
pthread_mutex_destroy(&mMutex);
#endif
}
@@ -21,7 +21,7 @@ hkMutex::~hkMutex() {
void hkMutex::Lock() {
#if HK_PLATFORM == HK_PLATFORM_WIN
EnterCriticalSection(&mMutex);
#elif defined( HK_PLATFORM_UNIX )
#elif defined( HK_PLATFORM_POSIX )
pthread_mutex_lock(&mMutex);
#endif
}
@@ -29,7 +29,7 @@ void hkMutex::Lock() {
void hkMutex::Unlock() {
#if HK_PLATFORM == HK_PLATFORM_WIN
LeaveCriticalSection(&mMutex);
#elif defined( HK_PLATFORM_UNIX )
#elif defined( HK_PLATFORM_POSIX )
pthread_mutex_unlock(&mMutex);
#endif
}

2
src/helper/haikuttf/hkmutex.hpp
View File

@@ -17,7 +17,7 @@ class hkMutex {
protected:
#if HK_PLATFORM == HK_PLATFORM_WIN
CRITICAL_SECTION mMutex;
#elif defined( HK_PLATFORM_UNIX )
#elif defined( HK_PLATFORM_POSIX )
pthread_mutex_t mMutex;
#endif
};