TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #499 from Azaezel/alpha40/macwork

Browse source 
mac compilation and standarization fixes
This commit is contained in:
Brian Roberts 2021-07-05 17:56:22 -05:00 committed by GitHub
parent 312d55be47 cddacf1c48
commit 18a7e31991
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Engine/lib/convexDecomp/NvThreadConfig.cpp
View file

@ -129,17 +129,15 @@ void tc_sleep(NxU32 ms)
void tc_spinloop()
{
#ifdef __linux__
asm ( "pause" );
#elif defined( _XBOX )
// Pause would do nothing on the Xbox. Threads are not scheduled.
#elif defined( _WIN64 )
YieldProcessor( );
#elif (defined( __arm64__ ) && defined( __APPLE__ )) || defined( __arch64__ )
pthread_yield_np();
#else
__asm { pause };
#endif
#if defined( _XBOX )
// Pause would do nothing on the Xbox. Threads are not scheduled.
#elif defined( _WIN64 )
YieldProcessor( );
#elif defined( __APPLE__ )||(__linux__)
pthread_yield_np();
#else
__asm { pause };
#endif
}
void tc_interlockedExchange(void *dest, const int64_t exchange)

2
Engine/source/platformMac/macPlatform.mm
View file

@ -97,7 +97,7 @@ const char* Platform::getUserDataDirectory()
//-----------------------------------------------------------------------------
const char* Platform::getUserHomeDirectory()
{
return StringTable->insert([[@"~/" stringByStandardizingPath] UTF8String]);
return StringTable->insert([[@"~/Documents" stringByStandardizingPath] UTF8String]);
}
//-----------------------------------------------------------------------------