diff options
| -rw-r--r-- | backend/ninja/Ninja.cpp | 6 | ||||
| -rw-r--r-- | msvc/sibs.exe | bin | 356352 -> 372224 bytes |
2 files changed, 3 insertions, 3 deletions
diff --git a/backend/ninja/Ninja.cpp b/backend/ninja/Ninja.cpp index 666bba7..53b1667 100644 --- a/backend/ninja/Ninja.cpp +++ b/backend/ninja/Ninja.cpp @@ -636,12 +636,12 @@ namespace backend Result<bool> Ninja::build(const SibsConfig &config, const _tinydir_char_t *savePath, LinkerFlagCallbackFunc staticLinkerFlagCallbackFunc, LinkerFlagCallbackFunc dynamicLinkerFlagCallback, GlobalIncludeDirCallbackFunc globalIncludeDirCallback) { bool isCCompilerClang = false; - Result<ExecResult> cCompilerVersion = exec("cc --version"); + Result<ExecResult> cCompilerVersion = exec(TINYDIR_STRING("cc --version")); if(cCompilerVersion && cCompilerVersion.unwrap().exitCode == 0 && cCompilerVersion.unwrap().execStdout.find("clang") != string::npos) isCCompilerClang = true; bool isCppCompilerClang = false; - Result<ExecResult> cppCompilerVersion = exec("c++ --version"); + Result<ExecResult> cppCompilerVersion = exec(TINYDIR_STRING("c++ --version")); if(cppCompilerVersion && cppCompilerVersion.unwrap().exitCode == 0 && cppCompilerVersion.unwrap().execStdout.find("clang") != string::npos) isCppCompilerClang = true; @@ -895,7 +895,7 @@ namespace backend compileCCommand.push_back(ninja::NinjaArg("/w")); // TODO: Remove this once locate_windows_sdk has been updated to locate multiple arch windows sdk -#ifdef _WIN32 +#if OS_TYPE == OS_TYPE_WINDOWS && defined(SIBS_ENV_32BIT) #error "sibs is currently not supported on windows 32-bit because locate_windows_sdk can only locate x64 windows sdk" #endif diff --git a/msvc/sibs.exe b/msvc/sibs.exe Binary files differindex 7898953..3d2ba7d 100644 --- a/msvc/sibs.exe +++ b/msvc/sibs.exe |