eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 11:39:19 +02:00
Code Issues 123 Wiki Activity

Merge branch 'gfx-work' of https://github.com/Milek7/maszyna into gfx-work

Browse Source
This commit is contained in:
milek
2019-03-25 19:54:24 +00:00
parent 01ac5535f1 901175f54a
commit 409a5340aa
7 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Driver.cpp
View File

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

2
Logs.cpp
View File

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

5
PyInt.cpp
View File

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

4
Timer.cpp
View File

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

4
application.cpp
View File

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

2
screenshot.cpp
View File

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

2
stdafx.h
View File

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