diff options
| author | dec05eba <dec05eba@protonmail.com> | 2017-12-31 06:17:54 +0100 |
|---|---|---|
| committer | dec05eba <dec05eba@protonmail.com> | 2017-12-31 06:19:50 +0100 |
| commit | ab712cf153e543e84a5c6484e19d22ba90bdbeff (patch) | |
| tree | b82b101b586deb6caca63a1de8737a89e82bd4f5 /backend/ninja | |
| parent | ae213b2b6f8dcc75de53ab27b0b35bc3455a8eb3 (diff) | |
Add cmake building, add ignore dirs option
Sometimes it's not possible to build new sibs with older sibs because
of changes that break backwards compatbility.
If sibs installation fails with sibs, use cmake.
Diffstat (limited to 'backend/ninja')
| -rw-r--r-- | backend/ninja/Ninja.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/backend/ninja/Ninja.cpp b/backend/ninja/Ninja.cpp index 0b46891..f83835f 100644 --- a/backend/ninja/Ninja.cpp +++ b/backend/ninja/Ninja.cpp @@ -624,7 +624,7 @@ namespace backend case Compiler::MSVC: { // TODO: Do not link all of these. Find a way to only link the ones that are needed - result += " LINK_ARGS = Ws2_32.lib Wldap32.lib Crypt32.lib Advapi32.lib Gdi32.lib User32.lib "; + result += " LINK_ARGS = Ws2_32.lib Wldap32.lib Crypt32.lib Advapi32.lib Gdi32.lib User32.lib Userenv.lib "; break; } } @@ -683,7 +683,7 @@ namespace backend result += join(objectNames, " "); result += "\n"; // TODO: Do not link all of these. Find a way to only link the ones that are needed - result += " LINK_ARGS = Ws2_32.lib Wldap32.lib Crypt32.lib Advapi32.lib Gdi32.lib User32.lib "; + result += " LINK_ARGS = Ws2_32.lib Wldap32.lib Crypt32.lib Advapi32.lib Gdi32.lib User32.lib Userenv.lib "; projectGeneratedBinary += config.getPackageName() + ".lib"; break; } @@ -781,6 +781,7 @@ namespace backend backend::Ninja ninja; if(!projectGeneratedBinary.empty()) ninja.addDependency(projectGeneratedBinary); + // TODO: Use same source file finder as in main.cpp walkDirFilesRecursive(testSourceDirNative.c_str(), [&ninja, &sibsTestConfig](tinydir_file *file) { if (isSourceFile(file)) |