diff options
author | 2020-08-25 19:41:32 +0200 | |
---|---|---|
committer | 2020-08-25 19:41:32 +0200 | |
commit | 0aa5aea84f6749553837c9ef28cdc75e8d4b773d (patch) | |
tree | c5e01f3a8c94e7a6d8e1303093f45d67a22de35e /src/lib/netlist/nl_base.cpp | |
parent | 65abe0cd888078a242744383c8372c46e87f2090 (diff) |
netlist: Fix various issues around include directories.
* removed include directory src/lib/netlist from various genie files to
avoid potential issues.
* Code using netlist should use #include "netlist/*".
* Updated includes.
* Fixed standalone makefile depend target to properly deal with relative
paths.
Diffstat (limited to 'src/lib/netlist/nl_base.cpp')
-rw-r--r-- | src/lib/netlist/nl_base.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp index f4aaaa930cc..91e192240df 100644 --- a/src/lib/netlist/nl_base.cpp +++ b/src/lib/netlist/nl_base.cpp @@ -139,14 +139,17 @@ namespace netlist "#define IND_N(ind) ((ind) * 1e-9) \n" "#define IND_P(ind) ((ind) * 1e-12) \n"; m_setup->parser().add_include<plib::psource_str_t>("netlist/devices/net_lib.h", content); + + // This is for core macro libraries + m_setup->parser().add_include<plib::psource_str_t>("devices/net_lib.h", content); #if 1 NETLIST_NAME(base_lib)(m_setup->parser()); #else - // FIXME: This is very slow - need optimized parsing scanning #if 1 m_setup->parser().register_source<source_pattern_t>("src/lib/netlist/macro/nlm_{1}.cpp"); m_setup->parser().include("base_lib"); #else + // FIXME: This is very slow - need optimized parsing scanning pstring dir = "src/lib/netlist/macro/"; //m_setup->parser().register_source<source_pattern_t>("src/lib/netlist/macro/nlm_{}.cpp"); m_setup->parser().register_source<source_file_t>(dir + "nlm_base_lib.cpp"); |