aboutsummaryrefslogtreecommitdiff
path: root/backend/ninja
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-10-27 17:54:13 +0200
committerdec05eba <dec05eba@protonmail.com>2020-07-06 07:39:33 +0200
commit0f3b3c10d63140509ebcd466b281a78e7f745225 (patch)
tree3e01fbe0025a5a9d6900a969bb7d87516028fb4d /backend/ninja
parent1c6ab0b07f18f2c6919ebb45c40da1e00b7ecf83 (diff)
Fix build for windows, release new windows build
Diffstat (limited to 'backend/ninja')
-rw-r--r--backend/ninja/Ninja.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/ninja/Ninja.cpp b/backend/ninja/Ninja.cpp
index 2482e9d..e332bd7 100644
--- a/backend/ninja/Ninja.cpp
+++ b/backend/ninja/Ninja.cpp
@@ -680,7 +680,7 @@ namespace backend
if(it == filepath.rend())
return TINYDIR_STRING("");
else
- return filepath.substr(0, it.base().base() - &filepath[0]);
+ return filepath.substr(0, &*it.base() - &filepath[0]);
}
static string extractDynamicLibDirsFromLinkerFlag(const string &linkerFlag)
@@ -969,10 +969,10 @@ namespace backend
{
// TODO: Executable type does not guarantee the executable should be a console on windows. Find a way to define window type as well
case LibraryType::EXECUTABLE:
- defines.push_back(ninja::NinjaArg::createRaw(" _CONSOLE"));
+ defines.push_back(ninja::NinjaArg::createRaw(getDefineFlag(config.getCompiler(), "_CONSOLE", "")));
break;
case LibraryType::STATIC:
- defines.push_back(ninja::NinjaArg::createRaw(" _LIB"));
+ defines.push_back(ninja::NinjaArg::createRaw(getDefineFlag(config.getCompiler(), "_LIB", "")));
break;
}
}