diff --git a/client/sim.h b/client/sim.h index d3ba5cd81c..7948237501 100644 --- a/client/sim.h +++ b/client/sim.h @@ -282,6 +282,7 @@ public: bool scheduler_rpc_poll(); bool simulate_rpc(PROJECT*); void print_project_results(FILE*); + bool in_abort_sequence; }; class NET_STATUS { diff --git a/lib/coproc.cpp b/lib/coproc.cpp index 6aa061683f..b2f04e0176 100644 --- a/lib/coproc.cpp +++ b/lib/coproc.cpp @@ -19,7 +19,9 @@ #include #include #ifdef _WIN32 +#ifndef SIM #include +#endif #else #ifdef __APPLE__ // Suppress obsolete warning when building for OS 10.3.9 @@ -155,6 +157,7 @@ string COPROC_CUDA::get(COPROCS& coprocs) { return "Library doesn't have cudaGetDeviceProperties()"; } +#ifndef SIM NvAPI_Status nvapiStatus; NvDisplayHandle hDisplay; NV_DISPLAY_DRIVER_VERSION Version; @@ -168,6 +171,7 @@ string COPROC_CUDA::get(COPROCS& coprocs) { nvapiStatus = NvAPI_GetDisplayDriverVersion(hDisplay, &Version); if (nvapiStatus == NVAPI_OK) break; } +#endif #else void* cudalib; @@ -208,7 +212,7 @@ string COPROC_CUDA::get(COPROCS& coprocs) { (*__cudaGetDeviceProperties)(&cc.prop, i); if (cc.prop.major <= 0) continue; // major == 0 means emulation if (cc.prop.major > 100) continue; // e.g. 9999 is an error -#ifdef _WIN32 +#if defined(_WIN32) && !defined(SIM) cc.drvVersion = Version.drvVersion; #else cc.drvVersion = 0; diff --git a/win_build/libboinc_staticcrt.vcproj b/win_build/libboinc_staticcrt.vcproj index 54cd73527a..01ff0a6211 100644 --- a/win_build/libboinc_staticcrt.vcproj +++ b/win_build/libboinc_staticcrt.vcproj @@ -43,7 +43,7 @@