Use correct API.

egorpugin · egorpugin · commit 7153617dcaaa · 2019-08-07T10:58:56.000+03:00
diff --git a/sw.cpp b/sw.cpp
@@ -33,9 +33,9 @@ void configure(Build &s)
         s.loadModule("utils/cc/win2android.cpp").call<void(Solution&)>("configure", s);
 #endif
 
-    //s.getSettings().Native.ConfigurationType = ConfigurationType::ReleaseWithDebugInformation;
-    //s.getSettings().Native.CompilerType = CompilerType::ClangCl;
-    //s.getSettings().Native.CompilerType = CompilerType::Clang;
+    //s.getBuildSettings().Native.ConfigurationType = ConfigurationType::ReleaseWithDebugInformation;
+    //s.getBuildSettings().Native.CompilerType = CompilerType::ClangCl;
+    //s.getBuildSettings().Native.CompilerType = CompilerType::Clang;
 }
 
 void build(Solution &s)
@@ -57,12 +57,12 @@ void build(Solution &s)
             "org.sw.demo.boost.property_tree"_dep,
             "org.sw.demo.boost.stacktrace"_dep;
         support.ApiName = "SW_SUPPORT_API";
-        if (support.getSettings().TargetOS.Type == OSType::Windows)
+        if (support.getBuildSettings().TargetOS.Type == OSType::Windows)
         {
             support.Protected += "_CRT_SECURE_NO_WARNINGS"_d;
             support.Public += "UNICODE"_d;
         }
-        if (support.getSettings().TargetOS.Type == OSType::Macos)
+        if (support.getBuildSettings().TargetOS.Type == OSType::Macos)
             support.Public += "BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED"_def;
     }
 
@@ -101,7 +101,7 @@ void build(Solution &s)
             ;
 
         manager.Public -= "pub.egorpugin.primitives.win32helpers-master"_dep;
-        if (manager.getSettings().TargetOS.Type == OSType::Windows)
+        if (manager.getBuildSettings().TargetOS.Type == OSType::Windows)
             manager.Public += "pub.egorpugin.primitives.win32helpers-master"_dep;
 
         manager += "src/sw/manager/.*"_rr;
@@ -174,7 +174,7 @@ void build(Solution &s)
         core.CPPVersion = CPPLanguageStandard::CPP17;
         core.Public += builder;
         core += "src/sw/core/.*"_rr;
-        if (core.getSettings().TargetOS.Type == OSType::Windows)
+        if (core.getBuildSettings().TargetOS.Type == OSType::Windows)
             core += "OleAut32.lib"_slib;
     }
 
@@ -194,9 +194,9 @@ void build(Solution &s)
         gen_flex_bison("org.sw.demo.lexxmark.winflexbison-master"_dep, cpp_driver, "src/sw/driver/bazel/lexer.ll", "src/sw/driver/bazel/grammar.yy");
         if (cpp_driver.getCompilerType() == CompilerType::MSVC)
             cpp_driver.CompileOptions.push_back("-bigobj");
-        if (cpp_driver.getSettings().TargetOS.Type == OSType::Windows)
+        if (cpp_driver.getBuildSettings().TargetOS.Type == OSType::Windows)
             cpp_driver += "dbghelp.lib"_slib;
-        //else if (s.getSettings().Native.CompilerType == CompilerType::GNU)
+        //else if (s.getBuildSettings().Native.CompilerType == CompilerType::GNU)
             //cpp_driver.CompileOptions.push_back("-Wa,-mbig-obj");
         {
             auto c = cpp_driver.addCommand();
@@ -239,7 +239,7 @@ void build(Solution &s)
         embed("pub.egorpugin.primitives.tools.embedder-master"_dep, client, "src/sw/client/inserts/inserts.cpp.in");
         if (client.getCompilerType() == CompilerType::MSVC)
             client.CompileOptions.push_back("-bigobj");
-        if (client.getSettings().TargetOS.Type == OSType::Linux)
+        if (client.getBuildSettings().TargetOS.Type == OSType::Linux)
         {
             //client.getSelectedTool()->LinkOptions.push_back("-static-libstdc++");
             //client.getSelectedTool()->LinkOptions.push_back("-static-libgcc");
@@ -254,15 +254,15 @@ void build(Solution &s)
             c.c->always = true;
         }
 
-        if (client.getSettings().TargetOS.Type == OSType::Windows)
+        if (client.getBuildSettings().TargetOS.Type == OSType::Windows)
         {
             auto &client = tools.addTarget<ExecutableTarget>("client");
             client += "src/sw/tools/client.cpp";
             client +=
                 "org.sw.demo.boost.dll"_dep,
                 "org.sw.demo.boost.filesystem"_dep,
                 "user32.lib"_slib;
-            if (client.getSettings().TargetOS.Type == OSType::Windows)
+            if (client.getBuildSettings().TargetOS.Type == OSType::Windows)
                 client.Public += "UNICODE"_d;
         }
     }
