diff --git a/scripts/mk_util.py b/scripts/mk_util.py index a5f75fd1c..d2e3d6b4c 100644 --- a/scripts/mk_util.py +++ b/scripts/mk_util.py @@ -3046,6 +3046,7 @@ def mk_vs_proj_cl_compile(f, name, components, debug): else: f.write(';') f.write(get_component(dep).to_src_dir) + f.write(';%s\n' % os.path.join(REV_BUILD_DIR, SRC_DIR)) f.write('</AdditionalIncludeDirectories>\n') f.write(' </ClCompile>\n') diff --git a/src/util/lp/bound_analyzer_on_row.h b/src/util/lp/bound_analyzer_on_row.h index 2a9dccb5f..add25d389 100644 --- a/src/util/lp/bound_analyzer_on_row.h +++ b/src/util/lp/bound_analyzer_on_row.h @@ -8,7 +8,7 @@ #include "util/lp/implied_bound.h" #include "util/lp/test_bound_analyzer.h" #include <functional> -#include "util/lp/bound_propagator.h" +#include "util/lp/lp_bound_propagator.h" // We have an equality : sum by j of row[j]*x[j] = rs // We try to pin a var by pushing the total by using the variable bounds // In a loop we drive the partial sum down, denoting the variables of this process by _u. diff --git a/src/util/lp/bound_propagator.cpp b/src/util/lp/lp_bound_propagator.cpp similarity index 100% rename from src/util/lp/bound_propagator.cpp rename to src/util/lp/lp_bound_propagator.cpp diff --git a/src/util/lp/bound_propagator.h b/src/util/lp/lp_bound_propagator.h similarity index 100% rename from src/util/lp/bound_propagator.h rename to src/util/lp/lp_bound_propagator.h