mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-07-11 01:25:07 +02:00
Build fixes for clang on FreeBSD
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
#include "ppsspp_config.h"
|
#include "ppsspp_config.h"
|
||||||
|
|
||||||
#if defined(__linux__) && !defined(__ANDROID__)
|
#if defined(__linux__) || defined(__FreeBSD__) && !defined(__ANDROID__)
|
||||||
# include <dlfcn.h>
|
# include <dlfcn.h>
|
||||||
#elif defined(_WIN32)
|
#elif defined(_WIN32)
|
||||||
# include <windows.h>
|
# include <windows.h>
|
||||||
@@ -29,7 +29,7 @@ static bool IsRenderDocLoaded() {
|
|||||||
return false;
|
return false;
|
||||||
#elif defined(_WIN32)
|
#elif defined(_WIN32)
|
||||||
return (GetModuleHandleA("renderdoc.dll") != nullptr);
|
return (GetModuleHandleA("renderdoc.dll") != nullptr);
|
||||||
#elif defined(__linux__)
|
#elif defined(__linux__) || defined(__FreeBSD__)
|
||||||
// Returns a pointer if loaded, otherwise null
|
// Returns a pointer if loaded, otherwise null
|
||||||
void* handle = dlopen("librenderdoc.so", RTLD_NOW | RTLD_NOLOAD);
|
void* handle = dlopen("librenderdoc.so", RTLD_NOW | RTLD_NOLOAD);
|
||||||
if (handle) {
|
if (handle) {
|
||||||
@@ -37,6 +37,8 @@ static bool IsRenderDocLoaded() {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
#else
|
||||||
|
return false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -245,6 +245,8 @@ double time_now_unix_utc() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
double time_to_unix_utc(double t) {
|
double time_to_unix_utc(double t) {
|
||||||
|
struct timeval tv;
|
||||||
|
gettimeofday(&tv, nullptr);
|
||||||
return (double)tv.tv_sec + (double)tv.tv_usec * (1.0 / micros) + t;
|
return (double)tv.tv_sec + (double)tv.tv_usec * (1.0 / micros) + t;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user