change __linux__ to __unix__

This commit is contained in:
milek7
2019-03-25 20:54:17 +01:00
parent 65eec2ad84
commit 901175f54a
7 changed files with 13 additions and 8 deletions

View File

@@ -1638,7 +1638,7 @@ TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche,
if( WriteLogFlag ) {
#ifdef _WIN32
CreateDirectory( "physicslog", NULL );
#elif __linux__
#elif __unix__
mkdir( "physicslog", 0644 );
#endif
LogFile.open( std::string( "physicslog/" + VehicleName + ".dat" ),

View File

@@ -27,7 +27,7 @@ std::deque<std::string> log_scrollback;
std::string filename_date() {
::SYSTEMTIME st;
#ifdef __linux__
#ifdef __unix__
timespec ts;
clock_gettime(CLOCK_REALTIME, &ts);
tm *tms = localtime(&ts.tv_sec);

View File

@@ -131,6 +131,11 @@ auto python_taskqueue::init() -> bool {
Py_SetPythonHome("linuxpython64");
else
Py_SetPythonHome("linuxpython");
#elif __APPLE__
if (sizeof(void*) == 8)
Py_SetPythonHome("macpython64");
else
Py_SetPythonHome("macpython");
#endif
Py_Initialize();
PyEval_InitThreads();

View File

@@ -61,7 +61,7 @@ void UpdateTimers(bool pause)
#ifdef _WIN32
QueryPerformanceFrequency((LARGE_INTEGER *)&fr);
QueryPerformanceCounter((LARGE_INTEGER *)&count);
#elif __linux__
#elif __unix__
timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
count = (uint64_t)ts.tv_sec * 1000000000 + (uint64_t)ts.tv_nsec;
@@ -85,7 +85,7 @@ void UpdateTimers(bool pause)
oldCount = count;
// Keep track of the time lapse and frame count
#if __linux__
#if __unix__
double fTime = (double)(count / 1000000000);
#elif _WIN32_WINNT >= _WIN32_WINNT_VISTA
double fTime = ::GetTickCount64() * 0.001f; // Get current time in seconds

View File

@@ -32,7 +32,7 @@ http://mozilla.org/MPL/2.0/.
#pragma comment (lib, "dbghelp.lib")
#pragma comment (lib, "version.lib")
#ifdef __linux__
#ifdef __unix__
#include <unistd.h>
#include <sys/stat.h>
#endif
@@ -540,7 +540,7 @@ eu07_application::init_files() {
DeleteFile( "log.txt" );
DeleteFile( "errors.txt" );
CreateDirectory( "logs", NULL );
#elif __linux__
#elif __unix__
unlink("log.txt");
unlink("errors.txt");
mkdir("logs", 0755);

View File

@@ -38,7 +38,7 @@ void screenshot_manager::screenshot_save_thread( char *img, int w, int h )
uint64_t perf;
#ifdef _WIN32
QueryPerformanceCounter((LARGE_INTEGER*)&perf);
#elif __linux__
#elif __unix__
timespec ts;
clock_gettime(CLOCK_REALTIME, &ts);
perf = ts.tv_nsec;

View File

@@ -29,7 +29,7 @@
#include <shlobj.h>
#undef NOMINMAX
#endif
#ifdef __linux__
#ifdef __unix__
#include <sys/stat.h>
#endif
// stl