TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

mac compilation and standarization fixes

Browse source 
compresses void tc_spinloop() for both unix derivatives and apples to utilize pthread_yield_np();
mac only tweaks to Platform::getUserHomeDirectory() to return the ~/documents directory for parity with windows results
This commit is contained in:
AzaezelX 2021-07-01 14:10:07 -05:00
parent 6fe51cd9c3
commit cddacf1c48
2 changed files with 10 additions and 12 deletions
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() void tc_spinloop()
{ {
#ifdef __linux__ #if defined( _XBOX )
asm ( "pause" ); // Pause would do nothing on the Xbox. Threads are not scheduled.
#elif defined( _XBOX ) #elif defined( _WIN64 )
// Pause would do nothing on the Xbox. Threads are not scheduled. YieldProcessor( );
#elif defined( _WIN64 ) #elif defined( __APPLE__ )||(__linux__)
YieldProcessor( ); pthread_yield_np();
#elif (defined( __arm64__ ) && defined( __APPLE__ )) || defined( __arch64__ ) #else
pthread_yield_np(); __asm { pause };
#else #endif
__asm { pause };
#endif
} }
void tc_interlockedExchange(void *dest, const int64_t exchange) 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() const char* Platform::getUserHomeDirectory()
{ {
return StringTable->insert([[@"~/" stringByStandardizingPath] UTF8String]); return StringTable->insert([[@"~/Documents" stringByStandardizingPath] UTF8String]);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------