summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/nl_base.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/netlist/nl_base.cpp')
-rw-r--r--src/lib/netlist/nl_base.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index d3da7ec899b..a4510fe5765 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -1,7 +1,6 @@
// license:GPL-2.0+
// copyright-holders:Couriersud
-#include "macro/nlm_base_lib.h"
#include "solver/nld_matrix_solver.h"
#include "solver/nld_solver.h"
@@ -17,6 +16,8 @@
#include "nl_errstr.h"
+#include "devices/net_lib.h"
+
#include <limits>
namespace netlist
@@ -136,9 +137,13 @@ namespace netlist
m_setup->parser().add_include<plib::psource_str_t>("devices/net_lib.h", content);
#if 1
NETLIST_NAME(base_lib)(m_setup->parser());
+ //m_setup->parser().register_source<source_pattern_t>("../macro/modules/nlmod_{1}.cpp");
+ //m_setup->parser().register_source<source_pattern_t>("../macro/nlm_{1}.cpp");
#else
#if 1
m_setup->parser().register_source<source_pattern_t>("src/lib/netlist/macro/nlm_{1}.cpp");
+ m_setup->parser().register_source<source_pattern_t>("src/lib/netlist/generated/nlm_{1}.cpp");
+ m_setup->parser().register_source<source_pattern_t>("src/lib/netlist/macro/modules/nlmod_{1}.cpp");
m_setup->parser().include("base_lib");
#else
// FIXME: This is very slow - need optimized parsing scanning
@@ -209,7 +214,6 @@ namespace netlist
ENTRY(NL_USE_MEMPOOL)
ENTRY(NL_USE_QUEUE_STATS)
ENTRY(NL_USE_COPY_INSTEAD_OF_REFERENCE)
- ENTRY(NL_AUTO_DEVICES)
ENTRY(NL_USE_FLOAT128)
ENTRY(NL_USE_FLOAT_MATRIX)
ENTRY(NL_USE_LONG_DOUBLE_MATRIX)