using a consistent naming convention for naming tactic subfolders

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>

scripts/mk_make.py

@@ -41,22 +41,22 @@ add_lib('bit_blaster', ['rewriter', 'simplifier', 'old_params', 'tactic'], 'tact
 add_lib('smt', ['bit_blaster', 'macros', 'normal_forms', 'cmd_context', 
                 'substitution', 'grobner', 'euclid', 'proof_checker', 'pattern', 'parser_util'])
 add_lib('user_plugin', ['smt'], 'smt/user_plugin')
-add_lib('core_tactics', ['tactic', 'normal_forms'], 'tactic/core_tactics')
-add_lib('sat_tactic', ['tactic', 'sat'], 'tactic/sat_tactic')
-add_lib('arith_tactics', ['core_tactics', 'sat'], 'tactic/arith_tactics')
-add_lib('nlsat_tactic', ['nlsat', 'sat_tactic', 'arith_tactics'], 'tactic/nlsat_tactic')
-add_lib('subpaving_tactic', ['core_tactics', 'subpaving'], 'tactic/subpaving_tactic')
-add_lib('bv_tactics', ['tactic', 'bit_blaster'], 'tactic/bv_tactics')
+add_lib('core_tactics', ['tactic', 'normal_forms'], 'tactic/core')
+add_lib('sat_tactic', ['tactic', 'sat'], 'tactic/sat')
+add_lib('arith_tactics', ['core_tactics', 'sat'], 'tactic/arith')
+add_lib('nlsat_tactic', ['nlsat', 'sat_tactic', 'arith_tactics'], 'tactic/nlsat')
+add_lib('subpaving_tactic', ['core_tactics', 'subpaving'], 'tactic/subpaving')
+add_lib('bv_tactics', ['tactic', 'bit_blaster'], 'tactic/bv')
 add_lib('fuzzing', ['ast'], 'test/fuzzing')
 add_lib('fpa', ['core_tactics', 'bv_tactics', 'sat_tactic'], 'tactic/fpa')
-add_lib('smt_tactic', ['smt'], 'tactic/smt_tactic')
+add_lib('smt_tactic', ['smt'], 'tactic/smt')
 add_lib('extra_cmds', ['cmd_context', 'subpaving_tactic', 'arith_tactics'], 'cmd_context/extra_cmds')
-add_lib('sls_tactic', ['tactic', 'normal_forms', 'core_tactics', 'bv_tactics'], 'tactic/sls_tactic')
+add_lib('sls_tactic', ['tactic', 'normal_forms', 'core_tactics', 'bv_tactics'], 'tactic/sls')
 add_lib('aig', ['tactic'], 'tactic/aig')
 # TODO: split muz_qe into muz, qe. Perhaps, we should also consider breaking muz into muz and pdr.
 add_lib('muz_qe', ['smt', 'sat', 'smt2parser'])
-add_lib('smtlogic_tactics', ['arith_tactics', 'bv_tactics', 'nlsat_tactic', 'smt_tactic', 'aig', 'muz_qe'], 'tactic/smtlogic_tactics')
-add_lib('ufbv_tactic', ['normal_forms', 'core_tactics', 'macros', 'smt_tactic', 'rewriter'], 'tactic/ufbv_tactic')
+add_lib('smtlogic_tactics', ['arith_tactics', 'bv_tactics', 'nlsat_tactic', 'smt_tactic', 'aig', 'muz_qe'], 'tactic/smtlogics')
+add_lib('ufbv_tactic', ['normal_forms', 'core_tactics', 'macros', 'smt_tactic', 'rewriter'], 'tactic/ufbv')
 add_lib('portfolio', ['smtlogic_tactics', 'ufbv_tactic', 'fpa', 'aig', 'muz_qe', 'sls_tactic', 'subpaving_tactic'], 'tactic/portfolio')
 # TODO: delete SMT 1.0 frontend
 add_lib('api', ['portfolio', 'user_plugin'])

src/api/dll/dll.cpp

@@ -1,6 +1,6 @@
+#ifdef _WINDOWS
 
-#include "windows.h"
-
+#include<windows.h>
 
 #ifdef _MANAGED
 #pragma managed(push, off)
@@ -25,3 +25,5 @@ BOOL APIENTRY DllMain( HMODULE hModule,
 #ifdef _MANAGED
 #pragma managed(pop)
 #endif
+
+#endif