diff options
143 files changed, 240 insertions, 244 deletions
diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua index cd90ffe30a4..ede4d8b0a86 100644 --- a/scripts/src/devices.lua +++ b/scripts/src/devices.lua @@ -33,7 +33,6 @@ function devicesProject(_target, _subtarget) MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", MAME_DIR .. "src/devices", - MAME_DIR .. "src/lib/netlist", MAME_DIR .. "src/mame", -- used for sound amiga MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index 4fc5a6ed27b..66387c572df 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -21,9 +21,9 @@ project "netlist" } includedirs { - MAME_DIR .. "src/lib/netlist", - MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/lib", + -- MAME_DIR .. "src/osd", + -- MAME_DIR .. "src/lib/util", -- ext_includedir("expat"), } diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 54bff0efb43..fa1b5740d5f 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -505,25 +505,15 @@ if _OPTIONS["SEPARATE_BIN"]~="1" then end links { - "utils", - ext_lib("expat"), - "7z", - "ocore_" .. _OPTIONS["osd"], "netlist", - ext_lib("zlib"), - ext_lib("flac"), - ext_lib("utf8proc"), } includedirs { - MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib/util", - MAME_DIR .. "src/lib/netlist", + MAME_DIR .. "src/lib", } files { MAME_DIR .. "src/lib/netlist/prg/nltool.cpp", - MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } @@ -550,20 +540,20 @@ if _OPTIONS["SEPARATE_BIN"]~="1" then end links { - "utils", - "ocore_" .. _OPTIONS["osd"], +-- "utils", +-- "ocore_" .. _OPTIONS["osd"], "netlist", } includedirs { - MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib/util", - MAME_DIR .. "src/lib/netlist", +-- MAME_DIR .. "src/osd", +-- MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/lib", } files { MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp", - MAME_DIR .. "src/emu/emucore.cpp", +-- MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp index b689b6eb468..6064b26ca83 100644 --- a/src/devices/machine/netlist.cpp +++ b/src/devices/machine/netlist.cpp @@ -17,7 +17,7 @@ #include "netlist/nl_parser.h" #include "netlist/devices/net_lib.h" -#include "plib/palloc.h" +#include "netlist/plib/palloc.h" #include "debugger.h" diff --git a/src/lib/netlist/analog/nld_bjt.cpp b/src/lib/netlist/analog/nld_bjt.cpp index 127614367cf..15145cfbbb8 100644 --- a/src/lib/netlist/analog/nld_bjt.cpp +++ b/src/lib/netlist/analog/nld_bjt.cpp @@ -5,9 +5,9 @@ * */ -#include "solver/nld_solver.h" -#include "analog/nlid_twoterm.h" -#include "nl_setup.h" +#include "../solver/nld_solver.h" +#include "nlid_twoterm.h" +#include "../nl_setup.h" #include <cmath> diff --git a/src/lib/netlist/analog/nld_bjt.h b/src/lib/netlist/analog/nld_bjt.h index 5e40bd1ef36..9e1f82afbaa 100644 --- a/src/lib/netlist/analog/nld_bjt.h +++ b/src/lib/netlist/analog/nld_bjt.h @@ -8,7 +8,7 @@ #ifndef NLD_BJT_H_ #define NLD_BJT_H_ -#include "nl_setup.h" +#include "../nl_setup.h" // ----------------------------------------------------------------------------- // Macros diff --git a/src/lib/netlist/analog/nld_fourterm.h b/src/lib/netlist/analog/nld_fourterm.h index bd420b8cfa9..b4bb5db1059 100644 --- a/src/lib/netlist/analog/nld_fourterm.h +++ b/src/lib/netlist/analog/nld_fourterm.h @@ -9,7 +9,7 @@ #define NLD_FOURTERM_H_ -#include "nl_setup.h" +#include "../nl_setup.h" // ---------------------------------------------------------------------------------------- // Macros diff --git a/src/lib/netlist/analog/nld_opamps.cpp b/src/lib/netlist/analog/nld_opamps.cpp index 64f6b1b6df9..680b2d1b885 100644 --- a/src/lib/netlist/analog/nld_opamps.cpp +++ b/src/lib/netlist/analog/nld_opamps.cpp @@ -6,8 +6,8 @@ */ #include "nld_opamps.h" -#include "nl_base.h" -#include "nl_errstr.h" +#include "../nl_base.h" +#include "../nl_errstr.h" #include "nlid_twoterm.h" #include "nlid_fourterm.h" diff --git a/src/lib/netlist/analog/nld_opamps.h b/src/lib/netlist/analog/nld_opamps.h index 31b883be688..d05a19aa3dc 100644 --- a/src/lib/netlist/analog/nld_opamps.h +++ b/src/lib/netlist/analog/nld_opamps.h @@ -10,7 +10,7 @@ #ifndef NLD_OPAMPS_H_ #define NLD_OPAMPS_H_ -#include "nl_setup.h" +#include "../nl_setup.h" // ---------------------------------------------------------------------------------------- // Macros diff --git a/src/lib/netlist/analog/nld_switches.cpp b/src/lib/netlist/analog/nld_switches.cpp index bf92a8cf4f8..1575551f260 100644 --- a/src/lib/netlist/analog/nld_switches.cpp +++ b/src/lib/netlist/analog/nld_switches.cpp @@ -6,8 +6,8 @@ */ #include "nlid_twoterm.h" -#include "nl_base.h" -#include "nl_factory.h" +#include "../nl_base.h" +#include "../nl_factory.h" #define R_OFF (1.0 / netlist().gmin()) #define R_ON 0.01 diff --git a/src/lib/netlist/analog/nld_switches.h b/src/lib/netlist/analog/nld_switches.h index 06af3fad0ca..3cd561f84b1 100644 --- a/src/lib/netlist/analog/nld_switches.h +++ b/src/lib/netlist/analog/nld_switches.h @@ -10,7 +10,7 @@ #ifndef NLD_SWITCHES_H_ #define NLD_SWITCHES_H_ -#include "nl_setup.h" +#include "../nl_setup.h" // ---------------------------------------------------------------------------------------- // Macros diff --git a/src/lib/netlist/analog/nld_twoterm.h b/src/lib/netlist/analog/nld_twoterm.h index 3ffbafd3b51..e89c347984f 100644 --- a/src/lib/netlist/analog/nld_twoterm.h +++ b/src/lib/netlist/analog/nld_twoterm.h @@ -4,7 +4,7 @@ #ifndef NLD_TWOTERM_H_ #define NLD_TWOTERM_H_ -#include "nl_setup.h" +#include "../nl_setup.h" // ----------------------------------------------------------------------------- // Macros diff --git a/src/lib/netlist/analog/nlid_fourterm.cpp b/src/lib/netlist/analog/nlid_fourterm.cpp index 493b22fe231..35ebe515092 100644 --- a/src/lib/netlist/analog/nlid_fourterm.cpp +++ b/src/lib/netlist/analog/nlid_fourterm.cpp @@ -5,9 +5,9 @@ * */ -#include "solver/nld_solver.h" +#include "../solver/nld_solver.h" +#include "../nl_factory.h" #include "nlid_fourterm.h" -#include "nl_setup.h" #include <cmath> diff --git a/src/lib/netlist/analog/nlid_fourterm.h b/src/lib/netlist/analog/nlid_fourterm.h index cfc8f30d751..52ca2545ae8 100644 --- a/src/lib/netlist/analog/nlid_fourterm.h +++ b/src/lib/netlist/analog/nlid_fourterm.h @@ -8,7 +8,7 @@ #ifndef NLID_FOURTERM_H_ #define NLID_FOURTERM_H_ -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { namespace analog { diff --git a/src/lib/netlist/analog/nlid_twoterm.cpp b/src/lib/netlist/analog/nlid_twoterm.cpp index a9a4edb604a..b9d6dde10f5 100644 --- a/src/lib/netlist/analog/nlid_twoterm.cpp +++ b/src/lib/netlist/analog/nlid_twoterm.cpp @@ -5,10 +5,10 @@ * */ -#include "solver/nld_solver.h" +#include "../solver/nld_solver.h" #include "nlid_twoterm.h" -#include "nl_factory.h" +#include "../nl_factory.h" #include <cmath> diff --git a/src/lib/netlist/analog/nlid_twoterm.h b/src/lib/netlist/analog/nlid_twoterm.h index e77f65be702..eb7544f5867 100644 --- a/src/lib/netlist/analog/nlid_twoterm.h +++ b/src/lib/netlist/analog/nlid_twoterm.h @@ -33,8 +33,8 @@ #ifndef NLID_TWOTERM_H_ #define NLID_TWOTERM_H_ -#include "nl_base.h" -#include "plib/pfunction.h" +#include "../nl_base.h" +#include "../plib/pfunction.h" // ----------------------------------------------------------------------------- // Implementation diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile index d2b1afa6b36..70ee274a9f0 100644 --- a/src/lib/netlist/build/makefile +++ b/src/lib/netlist/build/makefile @@ -21,7 +21,7 @@ endif # LTO = -flto=4 -fuse-linker-plugin -flto-partition=balanced -Wodr -CFLAGS = $(LTO) -g -O3 -std=c++11 -march=native -I.. -Wall -Wpedantic -Wsign-compare -Wextra -Wno-unused-parameter $(CEXTRAFLAGS) +CFLAGS = $(LTO) -g -O3 -std=c++11 -march=native -I../.. -Wall -Wpedantic -Wsign-compare -Wextra -Wno-unused-parameter $(CEXTRAFLAGS) LDFLAGS = $(LTO) -g -O3 -std=c++11 $(LDEXTRAFLAGS) LIBS = -lpthread -ldl @@ -175,7 +175,7 @@ maketree: $(sort $(OBJDIRS)) .PHONY: clang clang-5 mingw doc clang: - $(MAKE) CC=clang++ LD=clang++ CEXTRAFLAGS="-march=native -Weverything -Werror -Wno-padded -Wno-weak-vtables -Wno-missing-variable-declarations -Wconversion -Wno-c++98-compat -Wno-float-equal -Wno-global-constructors -Wno-c++98-compat-pedantic -Wno-format-nonliteral -Wno-weak-template-vtables -Wno-exit-time-destructors" + $(MAKE) CC=clang++ LD=clang++ CEXTRAFLAGS="-march=native -Weverything -Werror -Wno-unreachable-code -Wno-padded -Wno-weak-vtables -Wno-missing-variable-declarations -Wconversion -Wno-c++98-compat -Wno-float-equal -Wno-global-constructors -Wno-c++98-compat-pedantic -Wno-format-nonliteral -Wno-weak-template-vtables -Wno-exit-time-destructors" clang-5: $(MAKE) CC=clang++-5.0 LD=clang++-5.0 CEXTRAFLAGS="-march=native -Weverything -Werror -Wno-unreachable-code -Wno-padded -Wno-weak-vtables -Wno-missing-variable-declarations -Wconversion -Wno-c++98-compat -Wno-float-equal -Wno-global-constructors -Wno-c++98-compat-pedantic -Wno-format-nonliteral -Wno-weak-template-vtables -Wno-exit-time-destructors" diff --git a/src/lib/netlist/devices/net_lib.cpp b/src/lib/netlist/devices/net_lib.cpp index 3fb47772c45..f13117bb3e4 100644 --- a/src/lib/netlist/devices/net_lib.cpp +++ b/src/lib/netlist/devices/net_lib.cpp @@ -9,8 +9,8 @@ ****************************************************************************/ #include "net_lib.h" -#include "nl_factory.h" -#include "solver/nld_solver.h" +#include "../nl_factory.h" +#include "../solver/nld_solver.h" #define xstr(s) # s diff --git a/src/lib/netlist/devices/net_lib.h b/src/lib/netlist/devices/net_lib.h index 9ac05f9bccb..6b0ecd815f5 100644 --- a/src/lib/netlist/devices/net_lib.h +++ b/src/lib/netlist/devices/net_lib.h @@ -11,7 +11,7 @@ #ifndef NET_LIB_H #define NET_LIB_H -#include "nl_setup.h" +#include "netlist/nl_setup.h" //#define NL_AUTO_DEVICES 1 @@ -83,16 +83,16 @@ #include "nld_log.h" -#include "macro/nlm_cd4xxx.h" -#include "macro/nlm_ttl74xx.h" -#include "macro/nlm_opamp.h" -#include "macro/nlm_other.h" +#include "../macro/nlm_cd4xxx.h" +#include "../macro/nlm_ttl74xx.h" +#include "../macro/nlm_opamp.h" +#include "../macro/nlm_other.h" -#include "analog/nld_bjt.h" -#include "analog/nld_fourterm.h" -#include "analog/nld_switches.h" -#include "analog/nld_twoterm.h" -#include "analog/nld_opamps.h" +#include "../analog/nld_bjt.h" +#include "../analog/nld_fourterm.h" +#include "../analog/nld_switches.h" +#include "../analog/nld_twoterm.h" +#include "../analog/nld_opamps.h" #include "nld_legacy.h" #endif diff --git a/src/lib/netlist/devices/nld_2102A.cpp b/src/lib/netlist/devices/nld_2102A.cpp index 803f5b523c9..3b7d32f6322 100644 --- a/src/lib/netlist/devices/nld_2102A.cpp +++ b/src/lib/netlist/devices/nld_2102A.cpp @@ -6,7 +6,7 @@ */ #include "nld_2102A.h" -#include "nl_base.h" +#include "../nl_base.h" #define ADDR2BYTE(a) ((a) >> 3) #define ADDR2BIT(a) ((a) & 0x7) diff --git a/src/lib/netlist/devices/nld_2102A.h b/src/lib/netlist/devices/nld_2102A.h index bec20f9bd8c..52d892d4d40 100644 --- a/src/lib/netlist/devices/nld_2102A.h +++ b/src/lib/netlist/devices/nld_2102A.h @@ -24,7 +24,7 @@ #ifndef NLD_2102A_H_ #define NLD_2102A_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define RAM_2102A(name, cCEQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cRWQ, cDI) \ NET_REGISTER_DEV(RAM_2102A, name) \ diff --git a/src/lib/netlist/devices/nld_2716.cpp b/src/lib/netlist/devices/nld_2716.cpp index aa491c47d3c..cb53d60e205 100644 --- a/src/lib/netlist/devices/nld_2716.cpp +++ b/src/lib/netlist/devices/nld_2716.cpp @@ -6,7 +6,7 @@ */ #include "nld_2716.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_2716.h b/src/lib/netlist/devices/nld_2716.h index c96c726c11d..f4776242e6a 100644 --- a/src/lib/netlist/devices/nld_2716.h +++ b/src/lib/netlist/devices/nld_2716.h @@ -28,7 +28,7 @@ #ifndef NLD_2716_H_ #define NLD_2716_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define EPROM_2716(name, cGQ, cEPQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cA10) \ NET_REGISTER_DEV(EPROM_2716, name) \ diff --git a/src/lib/netlist/devices/nld_4020.cpp b/src/lib/netlist/devices/nld_4020.cpp index 14459fb3b62..8403d42bef2 100644 --- a/src/lib/netlist/devices/nld_4020.cpp +++ b/src/lib/netlist/devices/nld_4020.cpp @@ -5,7 +5,7 @@ * */ -#include "devices/nlid_cmos.h" +#include "nlid_cmos.h" #include "nld_4020.h" namespace netlist diff --git a/src/lib/netlist/devices/nld_4020.h b/src/lib/netlist/devices/nld_4020.h index 11b174e97f5..fd6b234da46 100644 --- a/src/lib/netlist/devices/nld_4020.h +++ b/src/lib/netlist/devices/nld_4020.h @@ -27,7 +27,7 @@ #ifndef NLD_4020_H_ #define NLD_4020_H_ -#include "nl_setup.h" +#include "../nl_setup.h" /* FIXME: only used in mario.c */ #define CD4020_WI(name, cIP, cRESET, cVDD, cVSS) \ diff --git a/src/lib/netlist/devices/nld_4066.cpp b/src/lib/netlist/devices/nld_4066.cpp index 11dca7b11dd..e0890adabcb 100644 --- a/src/lib/netlist/devices/nld_4066.cpp +++ b/src/lib/netlist/devices/nld_4066.cpp @@ -5,8 +5,8 @@ * */ -#include "devices/nlid_cmos.h" -#include "analog/nlid_twoterm.h" +#include "nlid_cmos.h" +#include "../analog/nlid_twoterm.h" #include "nld_4066.h" namespace netlist diff --git a/src/lib/netlist/devices/nld_4066.h b/src/lib/netlist/devices/nld_4066.h index fdaa76d65f3..e9fd579496c 100644 --- a/src/lib/netlist/devices/nld_4066.h +++ b/src/lib/netlist/devices/nld_4066.h @@ -24,7 +24,7 @@ #ifndef NLD_4066_H_ #define NLD_4066_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define CD4066_GATE(name) \ NET_REGISTER_DEV(CD4066_GATE, name) diff --git a/src/lib/netlist/devices/nld_4316.cpp b/src/lib/netlist/devices/nld_4316.cpp index 5c86f885545..9110eb0e569 100644 --- a/src/lib/netlist/devices/nld_4316.cpp +++ b/src/lib/netlist/devices/nld_4316.cpp @@ -5,8 +5,8 @@ * */ -#include "devices/nlid_cmos.h" -#include "analog/nlid_twoterm.h" +#include "nlid_cmos.h" +#include "../analog/nlid_twoterm.h" #include "nld_4316.h" namespace netlist { namespace devices { diff --git a/src/lib/netlist/devices/nld_4316.h b/src/lib/netlist/devices/nld_4316.h index 8d8ec4f0ae0..eb1d13f5542 100644 --- a/src/lib/netlist/devices/nld_4316.h +++ b/src/lib/netlist/devices/nld_4316.h @@ -25,7 +25,7 @@ #ifndef NLD_4316_H_ #define NLD_4316_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define CD4316_GATE(name) \ NET_REGISTER_DEV(CD4316_GATE, name) diff --git a/src/lib/netlist/devices/nld_74107.cpp b/src/lib/netlist/devices/nld_74107.cpp index 3a3c43ac0fa..45e9f56c08e 100644 --- a/src/lib/netlist/devices/nld_74107.cpp +++ b/src/lib/netlist/devices/nld_74107.cpp @@ -6,7 +6,7 @@ */ #include "nld_74107.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74107.h b/src/lib/netlist/devices/nld_74107.h index ed940f8170f..b59848cbb05 100644 --- a/src/lib/netlist/devices/nld_74107.h +++ b/src/lib/netlist/devices/nld_74107.h @@ -64,7 +64,7 @@ #ifndef NLD_74107_H_ #define NLD_74107_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_74107A(name, cCLK, cJ, cK, cCLRQ) \ NET_REGISTER_DEV(TTL_74107A, name) \ diff --git a/src/lib/netlist/devices/nld_74123.cpp b/src/lib/netlist/devices/nld_74123.cpp index 514ea4e9390..9055c5ce140 100644 --- a/src/lib/netlist/devices/nld_74123.cpp +++ b/src/lib/netlist/devices/nld_74123.cpp @@ -6,7 +6,7 @@ */ #include "nlid_system.h" -#include "analog/nlid_twoterm.h" +#include "../analog/nlid_twoterm.h" #include <cmath> diff --git a/src/lib/netlist/devices/nld_74123.h b/src/lib/netlist/devices/nld_74123.h index 15039c82f94..dfd75f746c7 100644 --- a/src/lib/netlist/devices/nld_74123.h +++ b/src/lib/netlist/devices/nld_74123.h @@ -49,7 +49,7 @@ #ifndef NLD_74123_H_ #define NLD_74123_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_74123(name) \ NET_REGISTER_DEV(TTL_74123, name) diff --git a/src/lib/netlist/devices/nld_74153.cpp b/src/lib/netlist/devices/nld_74153.cpp index efa6322e514..b74c09f8cc0 100644 --- a/src/lib/netlist/devices/nld_74153.cpp +++ b/src/lib/netlist/devices/nld_74153.cpp @@ -6,7 +6,7 @@ */ #include "nld_74153.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74153.h b/src/lib/netlist/devices/nld_74153.h index 6ace3b36d43..ee77d4224ce 100644 --- a/src/lib/netlist/devices/nld_74153.h +++ b/src/lib/netlist/devices/nld_74153.h @@ -45,7 +45,7 @@ #ifndef NLD_74153_H_ #define NLD_74153_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_74153(name, cC0, cC1, cC2, cC3, cA, cB, cG) \ NET_REGISTER_DEV(TTL_74153, name) \ diff --git a/src/lib/netlist/devices/nld_74161.cpp b/src/lib/netlist/devices/nld_74161.cpp index 4579fa41b7a..fc4f47b35c5 100644 --- a/src/lib/netlist/devices/nld_74161.cpp +++ b/src/lib/netlist/devices/nld_74161.cpp @@ -8,7 +8,7 @@ #define MAXCNT 15 #include "nld_74161.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74161.h b/src/lib/netlist/devices/nld_74161.h index 1a6b6b2ca87..363bc3c7f0d 100644 --- a/src/lib/netlist/devices/nld_74161.h +++ b/src/lib/netlist/devices/nld_74161.h @@ -25,7 +25,7 @@ #ifndef NLD_74161_H_ #define NLD_74161_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_74161(name, cA, cB, cC, cD, cCLRQ, cLOADQ, cCLK, cENABLEP, cENABLET) \ NET_REGISTER_DEV(TTL_74161, name) \ diff --git a/src/lib/netlist/devices/nld_74165.cpp b/src/lib/netlist/devices/nld_74165.cpp index c967f95d44c..678c1b1782e 100644 --- a/src/lib/netlist/devices/nld_74165.cpp +++ b/src/lib/netlist/devices/nld_74165.cpp @@ -6,7 +6,7 @@ */ #include "nld_74165.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74165.h b/src/lib/netlist/devices/nld_74165.h index 30970f5a20e..e38ca7bab86 100644 --- a/src/lib/netlist/devices/nld_74165.h +++ b/src/lib/netlist/devices/nld_74165.h @@ -27,7 +27,7 @@ #ifndef NLD_74165_H_ #define NLD_74165_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_74165(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH) \ NET_REGISTER_DEV(TTL_74165, name) \ diff --git a/src/lib/netlist/devices/nld_74166.cpp b/src/lib/netlist/devices/nld_74166.cpp index d56159183b0..32f075c4da5 100644 --- a/src/lib/netlist/devices/nld_74166.cpp +++ b/src/lib/netlist/devices/nld_74166.cpp @@ -6,7 +6,7 @@ */ #include "nld_74166.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74166.h b/src/lib/netlist/devices/nld_74166.h index bf5bbc8d0d8..b8a8a204374 100644 --- a/src/lib/netlist/devices/nld_74166.h +++ b/src/lib/netlist/devices/nld_74166.h @@ -27,7 +27,7 @@ #ifndef NLD_74166_H_ #define NLD_74166_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_74166(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH, cCLRQ) \ NET_REGISTER_DEV(TTL_74166, name) \ diff --git a/src/lib/netlist/devices/nld_74174.cpp b/src/lib/netlist/devices/nld_74174.cpp index d131b18af23..5f4573942bd 100644 --- a/src/lib/netlist/devices/nld_74174.cpp +++ b/src/lib/netlist/devices/nld_74174.cpp @@ -6,7 +6,7 @@ */ #include "nld_74174.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74174.h b/src/lib/netlist/devices/nld_74174.h index 43125b6af96..66824abb7aa 100644 --- a/src/lib/netlist/devices/nld_74174.h +++ b/src/lib/netlist/devices/nld_74174.h @@ -36,7 +36,7 @@ #ifndef NLD_74174_H_ #define NLD_74174_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_74174(name, cCLK, cD1, cD2, cD3, cD4, cD5, cD6, cCLRQ) \ NET_REGISTER_DEV(TTL_74174, name) \ diff --git a/src/lib/netlist/devices/nld_74175.cpp b/src/lib/netlist/devices/nld_74175.cpp index 3055a73f2c9..f8524caeb6d 100644 --- a/src/lib/netlist/devices/nld_74175.cpp +++ b/src/lib/netlist/devices/nld_74175.cpp @@ -6,7 +6,7 @@ */ #include "nld_74175.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74175.h b/src/lib/netlist/devices/nld_74175.h index 27dd01a2360..27e01b55b05 100644 --- a/src/lib/netlist/devices/nld_74175.h +++ b/src/lib/netlist/devices/nld_74175.h @@ -36,7 +36,7 @@ #ifndef NLD_74175_H_ #define NLD_74175_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_74175(name, cCLK, cD1, cD2, cD3, cD4, cCLRQ) \ NET_REGISTER_DEV(TTL_74175, name) \ diff --git a/src/lib/netlist/devices/nld_74192.cpp b/src/lib/netlist/devices/nld_74192.cpp index 77029cfdf50..2c7ee934d73 100644 --- a/src/lib/netlist/devices/nld_74192.cpp +++ b/src/lib/netlist/devices/nld_74192.cpp @@ -8,7 +8,7 @@ #define MAXCNT 9 #include "nld_74192.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74192.h b/src/lib/netlist/devices/nld_74192.h index 8c82006fe6c..613d463cf47 100644 --- a/src/lib/netlist/devices/nld_74192.h +++ b/src/lib/netlist/devices/nld_74192.h @@ -29,7 +29,7 @@ #ifndef NLD_74192_H_ #define NLD_74192_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_74192(name, cA, cB, cC, cD, cCLEAR, cLOADQ, cCU, cCD) \ NET_REGISTER_DEV(TTL_74192, name) \ diff --git a/src/lib/netlist/devices/nld_74193.cpp b/src/lib/netlist/devices/nld_74193.cpp index f5370719778..d4542d02408 100644 --- a/src/lib/netlist/devices/nld_74193.cpp +++ b/src/lib/netlist/devices/nld_74193.cpp @@ -8,7 +8,7 @@ #define MAXCNT 15 #include "nld_74193.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74193.h b/src/lib/netlist/devices/nld_74193.h index 53b6165e9f9..bb14a301f38 100644 --- a/src/lib/netlist/devices/nld_74193.h +++ b/src/lib/netlist/devices/nld_74193.h @@ -26,7 +26,7 @@ #ifndef NLD_74193_H_ #define NLD_74193_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_74193(name, cA, cB, cC, cD, cCLEAR, cLOADQ, cCU, cCD) \ NET_REGISTER_DEV(TTL_74193, name) \ diff --git a/src/lib/netlist/devices/nld_74194.cpp b/src/lib/netlist/devices/nld_74194.cpp index 4fe5092f4d5..d531e792885 100644 --- a/src/lib/netlist/devices/nld_74194.cpp +++ b/src/lib/netlist/devices/nld_74194.cpp @@ -6,7 +6,7 @@ */ #include "nld_74194.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74194.h b/src/lib/netlist/devices/nld_74194.h index 8d07b685e55..5124a66bcc0 100644 --- a/src/lib/netlist/devices/nld_74194.h +++ b/src/lib/netlist/devices/nld_74194.h @@ -26,7 +26,7 @@ #ifndef NLD_74194_H_ #define NLD_74194_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_74194(name, cCLK, cS0, cS1, cSRIN, cA, cB, cC, cD, cSLIN, cCLRQ) \ NET_REGISTER_DEV(TTL_74194, name) \ diff --git a/src/lib/netlist/devices/nld_74279.cpp b/src/lib/netlist/devices/nld_74279.cpp index ff8f12e07ea..91d46456028 100644 --- a/src/lib/netlist/devices/nld_74279.cpp +++ b/src/lib/netlist/devices/nld_74279.cpp @@ -7,7 +7,7 @@ #include "nlid_truthtable.h" #include "nld_74279.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74365.cpp b/src/lib/netlist/devices/nld_74365.cpp index f008b721344..10456ebbc21 100644 --- a/src/lib/netlist/devices/nld_74365.cpp +++ b/src/lib/netlist/devices/nld_74365.cpp @@ -6,7 +6,7 @@ */ #include "nld_74365.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74365.h b/src/lib/netlist/devices/nld_74365.h index 2a7fb230e5e..ca0eacf6ba1 100644 --- a/src/lib/netlist/devices/nld_74365.h +++ b/src/lib/netlist/devices/nld_74365.h @@ -25,7 +25,7 @@ #ifndef NLD_74365_H_ #define NLD_74365_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_74365(name, cG1Q, cG2Q, cA1, cA2, cA3, cA4, cA5, cA6) \ NET_REGISTER_DEV(TTL_74365, name) \ diff --git a/src/lib/netlist/devices/nld_7448.h b/src/lib/netlist/devices/nld_7448.h index 24cdcb8f6f1..801b7fdb2f4 100644 --- a/src/lib/netlist/devices/nld_7448.h +++ b/src/lib/netlist/devices/nld_7448.h @@ -24,7 +24,7 @@ #ifndef NLD_7448_H_ #define NLD_7448_H_ -#include "nl_setup.h" +#include "../nl_setup.h" /* * FIXME: Using truthtable is a lot slower than the explicit device diff --git a/src/lib/netlist/devices/nld_7450.cpp b/src/lib/netlist/devices/nld_7450.cpp index 2ad560b1d07..af9b9afada1 100644 --- a/src/lib/netlist/devices/nld_7450.cpp +++ b/src/lib/netlist/devices/nld_7450.cpp @@ -6,7 +6,7 @@ */ #include "nld_7450.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7450.h b/src/lib/netlist/devices/nld_7450.h index 47d997d3f3c..652516758ad 100644 --- a/src/lib/netlist/devices/nld_7450.h +++ b/src/lib/netlist/devices/nld_7450.h @@ -24,7 +24,7 @@ #ifndef NLD_7450_H_ #define NLD_7450_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_7450_ANDORINVERT(name, cI1, cI2, cI3, cI4) \ NET_REGISTER_DEV(TTL_7450_ANDORINVERT, name) \ diff --git a/src/lib/netlist/devices/nld_7473.cpp b/src/lib/netlist/devices/nld_7473.cpp index 3c88b0f8167..d9efb9fb710 100644 --- a/src/lib/netlist/devices/nld_7473.cpp +++ b/src/lib/netlist/devices/nld_7473.cpp @@ -6,7 +6,7 @@ */ #include "nld_7473.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7473.h b/src/lib/netlist/devices/nld_7473.h index 344e768cc44..5313d18570c 100644 --- a/src/lib/netlist/devices/nld_7473.h +++ b/src/lib/netlist/devices/nld_7473.h @@ -60,7 +60,7 @@ #ifndef NLD_7473_H_ #define NLD_7473_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_7473(name, cCLK, cJ, cK, cCLRQ) \ NET_REGISTER_DEV(TTL_7473, name) \ diff --git a/src/lib/netlist/devices/nld_7474.cpp b/src/lib/netlist/devices/nld_7474.cpp index 627d3a9b48a..9d020663f46 100644 --- a/src/lib/netlist/devices/nld_7474.cpp +++ b/src/lib/netlist/devices/nld_7474.cpp @@ -6,7 +6,7 @@ */ #include "nld_7474.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7474.h b/src/lib/netlist/devices/nld_7474.h index 25a9efe32c5..aa48e240387 100644 --- a/src/lib/netlist/devices/nld_7474.h +++ b/src/lib/netlist/devices/nld_7474.h @@ -42,7 +42,7 @@ #ifndef NLD_7474_H_ #define NLD_7474_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_7474(name, cCLK, cD, cCLRQ, cPREQ) \ NET_REGISTER_DEV(TTL_7474, name) \ diff --git a/src/lib/netlist/devices/nld_7475.cpp b/src/lib/netlist/devices/nld_7475.cpp index 7bf3f14d7f2..b2d28048513 100644 --- a/src/lib/netlist/devices/nld_7475.cpp +++ b/src/lib/netlist/devices/nld_7475.cpp @@ -7,7 +7,7 @@ */ #include "nld_7475.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7475.h b/src/lib/netlist/devices/nld_7475.h index 5689d6aa1e8..51d09e75a66 100644 --- a/src/lib/netlist/devices/nld_7475.h +++ b/src/lib/netlist/devices/nld_7475.h @@ -35,7 +35,7 @@ #ifndef NLD_7475_H_ #define NLD_7475_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define PARAMS_7475_7477(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4) \ NET_CONNECT(name, C1C2, cC1C2) \ diff --git a/src/lib/netlist/devices/nld_7483.cpp b/src/lib/netlist/devices/nld_7483.cpp index 518026e7fe5..72c86c003d5 100644 --- a/src/lib/netlist/devices/nld_7483.cpp +++ b/src/lib/netlist/devices/nld_7483.cpp @@ -6,7 +6,7 @@ */ #include "nld_7483.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7483.h b/src/lib/netlist/devices/nld_7483.h index 5d920c0bdbb..24952bf0501 100644 --- a/src/lib/netlist/devices/nld_7483.h +++ b/src/lib/netlist/devices/nld_7483.h @@ -27,7 +27,7 @@ #ifndef NLD_7483_H_ #define NLD_7483_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_7483(name, cA1, cA2, cA3, cA4, cB1, cB2, cB3, cB4, cCI) \ NET_REGISTER_DEV(TTL_7483, name) \ diff --git a/src/lib/netlist/devices/nld_7485.cpp b/src/lib/netlist/devices/nld_7485.cpp index 4526b9001ea..320cf762f26 100644 --- a/src/lib/netlist/devices/nld_7485.cpp +++ b/src/lib/netlist/devices/nld_7485.cpp @@ -6,7 +6,7 @@ */ #include "nld_7485.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7485.h b/src/lib/netlist/devices/nld_7485.h index 77ff6b0d530..61b87c37ba3 100644 --- a/src/lib/netlist/devices/nld_7485.h +++ b/src/lib/netlist/devices/nld_7485.h @@ -23,7 +23,7 @@ #ifndef NLD_7485_H_ #define NLD_7485_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_7485(name, cA0, cA1, cA2, cA3, cB0, cB1, cB2, cB3, cLTIN, cEQIN, cGTIN) \ NET_REGISTER_DEV(TTL_7485, name) \ diff --git a/src/lib/netlist/devices/nld_7490.cpp b/src/lib/netlist/devices/nld_7490.cpp index a85ccbcfbcb..7c547f05dbd 100644 --- a/src/lib/netlist/devices/nld_7490.cpp +++ b/src/lib/netlist/devices/nld_7490.cpp @@ -6,7 +6,7 @@ */ #include "nld_7490.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7490.h b/src/lib/netlist/devices/nld_7490.h index 657972618e9..5ff18543b03 100644 --- a/src/lib/netlist/devices/nld_7490.h +++ b/src/lib/netlist/devices/nld_7490.h @@ -55,7 +55,7 @@ #ifndef NLD_7490_H_ #define NLD_7490_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_7490(name, cA, cB, cR1, cR2, cR91, cR92) \ NET_REGISTER_DEV(TTL_7490, name) \ diff --git a/src/lib/netlist/devices/nld_7493.cpp b/src/lib/netlist/devices/nld_7493.cpp index df6ab4ad668..5d2147e928a 100644 --- a/src/lib/netlist/devices/nld_7493.cpp +++ b/src/lib/netlist/devices/nld_7493.cpp @@ -6,7 +6,7 @@ */ #include "nld_7493.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7493.h b/src/lib/netlist/devices/nld_7493.h index e102b07ed8a..ce9566aa28f 100644 --- a/src/lib/netlist/devices/nld_7493.h +++ b/src/lib/netlist/devices/nld_7493.h @@ -57,7 +57,7 @@ #ifndef NLD_7493_H_ #define NLD_7493_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_7493(name, cCLKA, cCLKB, cR1, cR2) \ NET_REGISTER_DEV(TTL_7493, name) \ diff --git a/src/lib/netlist/devices/nld_74ls629.cpp b/src/lib/netlist/devices/nld_74ls629.cpp index 26a5aaf2220..d6dc268ed28 100644 --- a/src/lib/netlist/devices/nld_74ls629.cpp +++ b/src/lib/netlist/devices/nld_74ls629.cpp @@ -40,7 +40,7 @@ #include "nld_74ls629.h" -#include "analog/nlid_twoterm.h" +#include "../analog/nlid_twoterm.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74ls629.h b/src/lib/netlist/devices/nld_74ls629.h index 273436f09fa..3351524a60b 100644 --- a/src/lib/netlist/devices/nld_74ls629.h +++ b/src/lib/netlist/devices/nld_74ls629.h @@ -28,7 +28,7 @@ #ifndef NLD_74LS629_H_ #define NLD_74LS629_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define SN74LS629(name, p_cap) \ NET_REGISTER_DEV(SN74LS629, name) \ diff --git a/src/lib/netlist/devices/nld_82S115.cpp b/src/lib/netlist/devices/nld_82S115.cpp index 855e22c0f87..2e24bbf9fed 100644 --- a/src/lib/netlist/devices/nld_82S115.cpp +++ b/src/lib/netlist/devices/nld_82S115.cpp @@ -6,7 +6,7 @@ */ #include "nld_82S115.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_82S115.h b/src/lib/netlist/devices/nld_82S115.h index 1ceb22dc1b1..ef7f1ec3910 100644 --- a/src/lib/netlist/devices/nld_82S115.h +++ b/src/lib/netlist/devices/nld_82S115.h @@ -28,7 +28,7 @@ #ifndef NLD_82S115_H_ #define NLD_82S115_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define PROM_82S115(name, cCE1Q, cCE2, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cSTROBE) \ NET_REGISTER_DEV(PROM_82S115, name) \ diff --git a/src/lib/netlist/devices/nld_82S123.cpp b/src/lib/netlist/devices/nld_82S123.cpp index 2152bd738eb..a8a6bfc9b57 100644 --- a/src/lib/netlist/devices/nld_82S123.cpp +++ b/src/lib/netlist/devices/nld_82S123.cpp @@ -6,7 +6,7 @@ */ #include "nld_82S123.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_82S123.h b/src/lib/netlist/devices/nld_82S123.h index a04e169ae93..dbf6bf63180 100644 --- a/src/lib/netlist/devices/nld_82S123.h +++ b/src/lib/netlist/devices/nld_82S123.h @@ -25,7 +25,7 @@ #ifndef NLD_82S123_H_ #define NLD_82S123_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define PROM_82S123(name, cCEQ, cA0, cA1, cA2, cA3, cA4) \ NET_REGISTER_DEV(PROM_82S123, name) \ diff --git a/src/lib/netlist/devices/nld_82S126.cpp b/src/lib/netlist/devices/nld_82S126.cpp index 221b7425c8d..dcacd1ec876 100644 --- a/src/lib/netlist/devices/nld_82S126.cpp +++ b/src/lib/netlist/devices/nld_82S126.cpp @@ -6,7 +6,7 @@ */ #include "nld_82S126.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_82S126.h b/src/lib/netlist/devices/nld_82S126.h index 27dd2217497..3079bb8e2e0 100644 --- a/src/lib/netlist/devices/nld_82S126.h +++ b/src/lib/netlist/devices/nld_82S126.h @@ -24,7 +24,7 @@ #ifndef NLD_82S126_H_ #define NLD_82S126_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define PROM_82S126(name, cCE1Q, cCE2Q, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7) \ NET_REGISTER_DEV(PROM_82S126, name) \ diff --git a/src/lib/netlist/devices/nld_82S16.cpp b/src/lib/netlist/devices/nld_82S16.cpp index a2a199a61d5..7441f6c677e 100644 --- a/src/lib/netlist/devices/nld_82S16.cpp +++ b/src/lib/netlist/devices/nld_82S16.cpp @@ -6,7 +6,7 @@ */ #include "nld_82S16.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_82S16.h b/src/lib/netlist/devices/nld_82S16.h index cfdd84584c6..d1117246d87 100644 --- a/src/lib/netlist/devices/nld_82S16.h +++ b/src/lib/netlist/devices/nld_82S16.h @@ -24,7 +24,7 @@ #ifndef NLD_82S16_H_ #define NLD_82S16_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_82S16(name) \ NET_REGISTER_DEV(TTL_82S16, name) diff --git a/src/lib/netlist/devices/nld_9310.cpp b/src/lib/netlist/devices/nld_9310.cpp index dd448c4282b..27f11c314fb 100644 --- a/src/lib/netlist/devices/nld_9310.cpp +++ b/src/lib/netlist/devices/nld_9310.cpp @@ -6,7 +6,7 @@ */ #include "nld_9310.h" -#include "nl_base.h" +#include "../nl_base.h" #define MAXCNT 9 diff --git a/src/lib/netlist/devices/nld_9310.h b/src/lib/netlist/devices/nld_9310.h index f55e4061e64..02cb45b2d86 100644 --- a/src/lib/netlist/devices/nld_9310.h +++ b/src/lib/netlist/devices/nld_9310.h @@ -45,7 +45,7 @@ #ifndef NLD_9310_H_ #define NLD_9310_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_9310(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD) \ NET_REGISTER_DEV(TTL_9310, name) \ diff --git a/src/lib/netlist/devices/nld_9312.h b/src/lib/netlist/devices/nld_9312.h index c85d86d2773..e31b1bb50c5 100644 --- a/src/lib/netlist/devices/nld_9312.h +++ b/src/lib/netlist/devices/nld_9312.h @@ -37,7 +37,7 @@ #ifndef NLD_9312_H_ #define NLD_9312_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_9312(name, cA, cB, cC, cD0, cD1, cD2, cD3, cD4, cD5, cD6, cD7, cSTROBE) \ NET_REGISTER_DEV(TTL_9312, name) \ diff --git a/src/lib/netlist/devices/nld_9316.cpp b/src/lib/netlist/devices/nld_9316.cpp index e9004417b6d..877d2da1a82 100644 --- a/src/lib/netlist/devices/nld_9316.cpp +++ b/src/lib/netlist/devices/nld_9316.cpp @@ -6,7 +6,7 @@ */ #include "nld_9316.h" -#include "nl_base.h" +#include "../nl_base.h" #define MAXCNT 15 diff --git a/src/lib/netlist/devices/nld_9316.h b/src/lib/netlist/devices/nld_9316.h index b0be896a6bd..99ab677d548 100644 --- a/src/lib/netlist/devices/nld_9316.h +++ b/src/lib/netlist/devices/nld_9316.h @@ -51,7 +51,7 @@ #ifndef NLD_9316_H_ #define NLD_9316_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_9316(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD) \ NET_REGISTER_DEV(TTL_9316, name) \ diff --git a/src/lib/netlist/devices/nld_9322.cpp b/src/lib/netlist/devices/nld_9322.cpp index b10213152f8..6c408498be7 100644 --- a/src/lib/netlist/devices/nld_9322.cpp +++ b/src/lib/netlist/devices/nld_9322.cpp @@ -6,7 +6,7 @@ */ #include "nld_9322.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_9322.h b/src/lib/netlist/devices/nld_9322.h index 08ec6efcd93..7de0f053b05 100644 --- a/src/lib/netlist/devices/nld_9322.h +++ b/src/lib/netlist/devices/nld_9322.h @@ -21,7 +21,7 @@ #ifndef NLD_9322_H_ #define NLD_9322_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_9322(name, cSELECT, cA1, cB1, cA2, cB2, cA3, cB3, cA4, cB4, cSTROBE) \ NET_REGISTER_DEV(TTL_9322, name) \ diff --git a/src/lib/netlist/devices/nld_am2847.cpp b/src/lib/netlist/devices/nld_am2847.cpp index 29a3b2417eb..5d0c5cb71a3 100644 --- a/src/lib/netlist/devices/nld_am2847.cpp +++ b/src/lib/netlist/devices/nld_am2847.cpp @@ -6,7 +6,7 @@ */ #include "nld_am2847.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_am2847.h b/src/lib/netlist/devices/nld_am2847.h index a820961ea2c..70d288d3eec 100644 --- a/src/lib/netlist/devices/nld_am2847.h +++ b/src/lib/netlist/devices/nld_am2847.h @@ -21,7 +21,7 @@ #ifndef NLD_AM2847_H_ #define NLD_AM2847_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_AM2847(name, cCP, cINA, cINB, cINC, cIND, cRCA, cRCB, cRCC, cRCD) \ NET_REGISTER_DEV(TTL_AM2847, name) \ diff --git a/src/lib/netlist/devices/nld_dm9334.cpp b/src/lib/netlist/devices/nld_dm9334.cpp index b8607374620..8dceded5390 100644 --- a/src/lib/netlist/devices/nld_dm9334.cpp +++ b/src/lib/netlist/devices/nld_dm9334.cpp @@ -6,7 +6,7 @@ */ #include "nld_dm9334.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_dm9334.h b/src/lib/netlist/devices/nld_dm9334.h index 813ea225add..1a07e051333 100644 --- a/src/lib/netlist/devices/nld_dm9334.h +++ b/src/lib/netlist/devices/nld_dm9334.h @@ -65,7 +65,7 @@ #ifndef NLD_DM9334_H_ #define NLD_DM9334_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_9334(name, cCQ, cEQ, cD, cA0, cA1, cA2) \ NET_REGISTER_DEV(TTL_9334, name) \ diff --git a/src/lib/netlist/devices/nld_legacy.cpp b/src/lib/netlist/devices/nld_legacy.cpp index 29cff9576ab..28fe0ad8188 100644 --- a/src/lib/netlist/devices/nld_legacy.cpp +++ b/src/lib/netlist/devices/nld_legacy.cpp @@ -6,7 +6,7 @@ */ #include "nld_legacy.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_legacy.h b/src/lib/netlist/devices/nld_legacy.h index a1e976220fd..33f7d0caaf8 100644 --- a/src/lib/netlist/devices/nld_legacy.h +++ b/src/lib/netlist/devices/nld_legacy.h @@ -13,7 +13,7 @@ #ifndef NLD_LEGACY_H_ #define NLD_LEGACY_H_ -#include "nl_setup.h" +#include "../nl_setup.h" // ---------------------------------------------------------------------------------------- // Macros diff --git a/src/lib/netlist/devices/nld_log.cpp b/src/lib/netlist/devices/nld_log.cpp index d69bc6aa81e..256e42ac80d 100644 --- a/src/lib/netlist/devices/nld_log.cpp +++ b/src/lib/netlist/devices/nld_log.cpp @@ -5,9 +5,9 @@ * */ -#include "nl_base.h" -#include "plib/pstream.h" -#include "plib/pfmtlog.h" +#include "../nl_base.h" +#include "../plib/pstream.h" +#include "../plib/pfmtlog.h" #include "nld_log.h" //#include "sound/wavwrite.h" diff --git a/src/lib/netlist/devices/nld_log.h b/src/lib/netlist/devices/nld_log.h index 716aea1b873..6364022cea2 100644 --- a/src/lib/netlist/devices/nld_log.h +++ b/src/lib/netlist/devices/nld_log.h @@ -18,7 +18,7 @@ #ifndef NLD_LOG_H_ #define NLD_LOG_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define LOG(name, cI) \ NET_REGISTER_DEV(??PG, name) \ diff --git a/src/lib/netlist/devices/nld_mm5837.cpp b/src/lib/netlist/devices/nld_mm5837.cpp index d9297166d94..3c5b301de9b 100644 --- a/src/lib/netlist/devices/nld_mm5837.cpp +++ b/src/lib/netlist/devices/nld_mm5837.cpp @@ -6,8 +6,8 @@ */ #include "nld_mm5837.h" -#include "solver/nld_matrix_solver.h" -#include "analog/nlid_twoterm.h" +#include "../solver/nld_matrix_solver.h" +#include "../analog/nlid_twoterm.h" #define R_LOW (1000.0) #define R_HIGH (1000.0) diff --git a/src/lib/netlist/devices/nld_mm5837.h b/src/lib/netlist/devices/nld_mm5837.h index d50a456b93c..4af397d9965 100644 --- a/src/lib/netlist/devices/nld_mm5837.h +++ b/src/lib/netlist/devices/nld_mm5837.h @@ -19,7 +19,7 @@ #ifndef NLD_MM5837_H_ #define NLD_MM5837_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define MM5837_DIP(name) \ NET_REGISTER_DEV(MM5837_DIP, name) diff --git a/src/lib/netlist/devices/nld_ne555.cpp b/src/lib/netlist/devices/nld_ne555.cpp index a171d05595a..8795197bd57 100644 --- a/src/lib/netlist/devices/nld_ne555.cpp +++ b/src/lib/netlist/devices/nld_ne555.cpp @@ -46,8 +46,8 @@ */ #include "nld_ne555.h" -#include "analog/nlid_twoterm.h" -#include "solver/nld_solver.h" +#include "../analog/nlid_twoterm.h" +#include "../solver/nld_solver.h" #define R_OFF (1E20) #define R_ON (25) // Datasheet states a maximum discharge of 200mA, R = 5V / 0.2 diff --git a/src/lib/netlist/devices/nld_ne555.h b/src/lib/netlist/devices/nld_ne555.h index c73906b1b66..c629253f08f 100644 --- a/src/lib/netlist/devices/nld_ne555.h +++ b/src/lib/netlist/devices/nld_ne555.h @@ -4,7 +4,7 @@ #ifndef NLD_NE555_H_ #define NLD_NE555_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define NE555(name) \ NET_REGISTER_DEV(NE555, name) diff --git a/src/lib/netlist/devices/nld_r2r_dac.cpp b/src/lib/netlist/devices/nld_r2r_dac.cpp index f4006eef31d..4c29389d491 100644 --- a/src/lib/netlist/devices/nld_r2r_dac.cpp +++ b/src/lib/netlist/devices/nld_r2r_dac.cpp @@ -5,9 +5,9 @@ * */ -#include "nl_base.h" -#include "nl_factory.h" -#include "analog/nlid_twoterm.h" +#include "../nl_base.h" +#include "../nl_factory.h" +#include "../analog/nlid_twoterm.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_r2r_dac.h b/src/lib/netlist/devices/nld_r2r_dac.h index b88d0f595f6..18e5bddc053 100644 --- a/src/lib/netlist/devices/nld_r2r_dac.h +++ b/src/lib/netlist/devices/nld_r2r_dac.h @@ -46,7 +46,7 @@ #ifndef NLD_R2R_DAC_H_ #define NLD_R2R_DAC_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define R2R_DAC(name, p_VIN, p_R, p_N) \ NET_REGISTER_DEV(R2R_DAC, name) \ diff --git a/src/lib/netlist/devices/nld_system.cpp b/src/lib/netlist/devices/nld_system.cpp index e3585271696..4baf8696fca 100644 --- a/src/lib/netlist/devices/nld_system.cpp +++ b/src/lib/netlist/devices/nld_system.cpp @@ -5,8 +5,8 @@ * */ -#include "solver/nld_solver.h" -#include "solver/nld_matrix_solver.h" +#include "../solver/nld_solver.h" +#include "../solver/nld_matrix_solver.h" #include "nlid_system.h" namespace netlist diff --git a/src/lib/netlist/devices/nld_system.h b/src/lib/netlist/devices/nld_system.h index 46781fe2884..69a7c75dbf3 100644 --- a/src/lib/netlist/devices/nld_system.h +++ b/src/lib/netlist/devices/nld_system.h @@ -9,7 +9,7 @@ #ifndef NLD_SYSTEM_H_ #define NLD_SYSTEM_H_ -#include "nl_setup.h" +#include "../nl_setup.h" // ----------------------------------------------------------------------------- // Macros diff --git a/src/lib/netlist/devices/nld_tristate.cpp b/src/lib/netlist/devices/nld_tristate.cpp index b724a09bf9c..74fbb206feb 100644 --- a/src/lib/netlist/devices/nld_tristate.cpp +++ b/src/lib/netlist/devices/nld_tristate.cpp @@ -6,7 +6,7 @@ */ #include "nld_tristate.h" -#include "nl_base.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_tristate.h b/src/lib/netlist/devices/nld_tristate.h index 604ae7f03fd..a5ff22fac96 100644 --- a/src/lib/netlist/devices/nld_tristate.h +++ b/src/lib/netlist/devices/nld_tristate.h @@ -10,7 +10,7 @@ #ifndef NLD_TRISTATE_H_ #define NLD_TRISTATE_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #define TTL_TRISTATE(name, cCEQ1, cD1, cCEQ2, cD2) \ NET_REGISTER_DEV(TTL_TRISTATE, name) \ diff --git a/src/lib/netlist/devices/nlid_cmos.h b/src/lib/netlist/devices/nlid_cmos.h index 2d836ef656d..f9999aebcc0 100644 --- a/src/lib/netlist/devices/nlid_cmos.h +++ b/src/lib/netlist/devices/nlid_cmos.h @@ -8,8 +8,8 @@ #ifndef NLID_CMOS_H_ #define NLID_CMOS_H_ -#include "nl_setup.h" -#include "nl_base.h" +#include "../nl_setup.h" +#include "../nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nlid_proxy.cpp b/src/lib/netlist/devices/nlid_proxy.cpp index 4b18ca0bbb2..6c25369d0e7 100644 --- a/src/lib/netlist/devices/nlid_proxy.cpp +++ b/src/lib/netlist/devices/nlid_proxy.cpp @@ -6,7 +6,7 @@ */ #include "nlid_proxy.h" -#include "solver/nld_solver.h" +#include "../solver/nld_solver.h" //#include "plib/pstream.h" //#include "plib/pfmtlog.h" //#include "nld_log.h" diff --git a/src/lib/netlist/devices/nlid_proxy.h b/src/lib/netlist/devices/nlid_proxy.h index 178faae20fd..0188ea7d9d6 100644 --- a/src/lib/netlist/devices/nlid_proxy.h +++ b/src/lib/netlist/devices/nlid_proxy.h @@ -11,8 +11,8 @@ #ifndef NLID_PROXY_H_ #define NLID_PROXY_H_ -#include "nl_setup.h" -#include "analog/nlid_twoterm.h" +#include "../nl_setup.h" +#include "../analog/nlid_twoterm.h" namespace netlist { diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h index 5bf75ca0497..9d5d2ec5aef 100644 --- a/src/lib/netlist/devices/nlid_system.h +++ b/src/lib/netlist/devices/nlid_system.h @@ -11,10 +11,10 @@ #ifndef NLID_SYSTEM_H_ #define NLID_SYSTEM_H_ -#include "nl_base.h" -#include "nl_setup.h" -#include "analog/nlid_twoterm.h" -#include "plib/putil.h" +#include "../nl_base.h" +#include "../nl_setup.h" +#include "../analog/nlid_twoterm.h" +#include "../plib/putil.h" namespace netlist { diff --git a/src/lib/netlist/devices/nlid_truthtable.cpp b/src/lib/netlist/devices/nlid_truthtable.cpp index 824061fdc30..013fa3c0769 100644 --- a/src/lib/netlist/devices/nlid_truthtable.cpp +++ b/src/lib/netlist/devices/nlid_truthtable.cpp @@ -6,9 +6,9 @@ */ #include "nlid_truthtable.h" -#include "plib/plists.h" -#include "nl_setup.h" -#include "plib/palloc.h" +#include "../plib/plists.h" +#include "../nl_setup.h" +#include "../plib/palloc.h" namespace netlist { diff --git a/src/lib/netlist/devices/nlid_truthtable.h b/src/lib/netlist/devices/nlid_truthtable.h index 68c3d680e40..b4c06834e19 100644 --- a/src/lib/netlist/devices/nlid_truthtable.h +++ b/src/lib/netlist/devices/nlid_truthtable.h @@ -10,9 +10,9 @@ #ifndef NLID_TRUTHTABLE_H_ #define NLID_TRUTHTABLE_H_ -#include "nl_setup.h" -#include "nl_base.h" -#include "plib/putil.h" +#include "../nl_setup.h" +#include "../nl_base.h" +#include "../plib/putil.h" #define NETLIB_TRUTHTABLE(cname, nIN, nOUT) \ class NETLIB_NAME(cname) : public nld_truthtable_t<nIN, nOUT> \ diff --git a/src/lib/netlist/macro/nlm_base.cpp b/src/lib/netlist/macro/nlm_base.cpp index b49bca48d74..62e713c76dc 100644 --- a/src/lib/netlist/macro/nlm_base.cpp +++ b/src/lib/netlist/macro/nlm_base.cpp @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Couriersud -#include "nl_setup.h" -#include "devices/net_lib.h" +#include "../nl_setup.h" +#include "../devices/net_lib.h" #include "nlm_base.h" /* ---------------------------------------------------------------------------- diff --git a/src/lib/netlist/macro/nlm_base.h b/src/lib/netlist/macro/nlm_base.h index 3719985c8c8..5ecf8071e98 100644 --- a/src/lib/netlist/macro/nlm_base.h +++ b/src/lib/netlist/macro/nlm_base.h @@ -10,7 +10,7 @@ #ifndef __PLIB_PREPROCESSOR__ -#include "nl_setup.h" +#include "../nl_setup.h" /* ---------------------------------------------------------------------------- * Netlist Macros diff --git a/src/lib/netlist/macro/nlm_cd4xxx.cpp b/src/lib/netlist/macro/nlm_cd4xxx.cpp index ed805cb52dc..9ce786ca85e 100644 --- a/src/lib/netlist/macro/nlm_cd4xxx.cpp +++ b/src/lib/netlist/macro/nlm_cd4xxx.cpp @@ -2,10 +2,10 @@ // copyright-holders:Couriersud #include "nlm_cd4xxx.h" -#include "devices/nld_system.h" -#include "devices/nld_4020.h" -#include "devices/nld_4066.h" -#include "devices/nld_4316.h" +#include "../devices/nld_system.h" +#include "../devices/nld_4020.h" +#include "../devices/nld_4066.h" +#include "../devices/nld_4316.h" /* * CD4001BC: Quad 2-Input NOR Buffered B Series Gate diff --git a/src/lib/netlist/macro/nlm_cd4xxx.h b/src/lib/netlist/macro/nlm_cd4xxx.h index 446c2d6e435..527336c1e8e 100644 --- a/src/lib/netlist/macro/nlm_cd4xxx.h +++ b/src/lib/netlist/macro/nlm_cd4xxx.h @@ -3,7 +3,7 @@ #ifndef NLD_CD4XXX_H_ #define NLD_CD4XXX_H_ -#include "nl_setup.h" +#include "../nl_setup.h" /* * Devices: diff --git a/src/lib/netlist/macro/nlm_opamp.cpp b/src/lib/netlist/macro/nlm_opamp.cpp index f363c88a100..122b324f777 100644 --- a/src/lib/netlist/macro/nlm_opamp.cpp +++ b/src/lib/netlist/macro/nlm_opamp.cpp @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Couriersud #include "nlm_opamp.h" -#include "devices/net_lib.h" +#include "../devices/net_lib.h" /* * Generic layout with 4 opamps, VCC on pin 4 and GND on pin 11 diff --git a/src/lib/netlist/macro/nlm_opamp.h b/src/lib/netlist/macro/nlm_opamp.h index ec717fdb2dc..9cffbb29c87 100644 --- a/src/lib/netlist/macro/nlm_opamp.h +++ b/src/lib/netlist/macro/nlm_opamp.h @@ -3,7 +3,7 @@ #ifndef NLM_OPAMP_H_ #define NLM_OPAMP_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #ifndef __PLIB_PREPROCESSOR__ diff --git a/src/lib/netlist/macro/nlm_other.cpp b/src/lib/netlist/macro/nlm_other.cpp index 49f4404427a..7e31ae27bb4 100644 --- a/src/lib/netlist/macro/nlm_other.cpp +++ b/src/lib/netlist/macro/nlm_other.cpp @@ -2,7 +2,7 @@ // copyright-holders:Couriersud #include "nlm_other.h" -#include "devices/nld_system.h" +#include "../devices/nld_system.h" /* * MC14584B: Hex Schmitt Trigger diff --git a/src/lib/netlist/macro/nlm_other.h b/src/lib/netlist/macro/nlm_other.h index f0e8ca05af0..7c38d8ad363 100644 --- a/src/lib/netlist/macro/nlm_other.h +++ b/src/lib/netlist/macro/nlm_other.h @@ -3,7 +3,7 @@ #ifndef NLM_OTHER_H_ #define NLM_OTHER_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #ifndef __PLIB_PREPROCESSOR__ diff --git a/src/lib/netlist/macro/nlm_ttl74xx.cpp b/src/lib/netlist/macro/nlm_ttl74xx.cpp index c8fe9912911..85b5570183b 100644 --- a/src/lib/netlist/macro/nlm_ttl74xx.cpp +++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp @@ -2,7 +2,7 @@ // copyright-holders:Couriersud #include "nlm_ttl74xx.h" -#include "devices/nld_system.h" +#include "../devices/nld_system.h" /* diff --git a/src/lib/netlist/macro/nlm_ttl74xx.h b/src/lib/netlist/macro/nlm_ttl74xx.h index 526fbf395da..82b6dfef20b 100644 --- a/src/lib/netlist/macro/nlm_ttl74xx.h +++ b/src/lib/netlist/macro/nlm_ttl74xx.h @@ -3,7 +3,7 @@ #ifndef NLD_TTL74XX_H_ #define NLD_TTL74XX_H_ -#include "nl_setup.h" +#include "../nl_setup.h" #ifndef __PLIB_PREPROCESSOR__ diff --git a/src/lib/netlist/plib/palloc.h b/src/lib/netlist/plib/palloc.h index 02249f09168..57dbff5588d 100644 --- a/src/lib/netlist/plib/palloc.h +++ b/src/lib/netlist/plib/palloc.h @@ -25,19 +25,26 @@ T *palloc(Args&&... args) } template<typename T> -void pfree(T *ptr) { delete ptr; } +void pfree(T *ptr) +{ + delete ptr; +} template<typename T> -inline T* palloc_array(const std::size_t num) +T* palloc_array(const std::size_t num) { return new T[num](); } template<typename T> -void pfree_array(T *ptr) { delete [] ptr; } +void pfree_array(T *ptr) +{ + delete [] ptr; +} template<typename T, typename... Args> -std::unique_ptr<T> make_unique(Args&&... args) { +std::unique_ptr<T> make_unique(Args&&... args) +{ return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); } diff --git a/src/lib/netlist/plib/putil.cpp b/src/lib/netlist/plib/putil.cpp index 6a24e8c4012..f4251e161fa 100644 --- a/src/lib/netlist/plib/putil.cpp +++ b/src/lib/netlist/plib/putil.cpp @@ -6,9 +6,9 @@ #include <algorithm> #include <initializer_list> -#include "plib/putil.h" -#include "plib/ptypes.h" -#include "plib/plists.h" +#include "putil.h" +#include "ptypes.h" +#include "plists.h" namespace plib { diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp index 353afa8556c..4e9875dd06d 100644 --- a/src/lib/netlist/prg/nltool.cpp +++ b/src/lib/netlist/prg/nltool.cpp @@ -8,12 +8,12 @@ ****************************************************************************/ -#include "plib/poptions.h" -#include "nl_setup.h" -#include "nl_parser.h" -#include "devices/net_lib.h" -#include "tools/nl_convert.h" -#include "solver/nld_solver.h" +#include "netlist/plib/poptions.h" +#include "netlist/nl_setup.h" +#include "netlist/nl_parser.h" +#include "netlist/devices/net_lib.h" +#include "netlist/tools/nl_convert.h" +#include "netlist/solver/nld_solver.h" class tool_options_t : public plib::options { diff --git a/src/lib/netlist/prg/nlwav.cpp b/src/lib/netlist/prg/nlwav.cpp index 52f59f366f6..654df8d2dbb 100644 --- a/src/lib/netlist/prg/nlwav.cpp +++ b/src/lib/netlist/prg/nlwav.cpp @@ -1,12 +1,12 @@ // license:GPL-2.0+ // copyright-holders:Couriersud #include <cstring> -#include "plib/pstring.h" -#include "plib/plists.h" -#include "plib/pstream.h" -#include "plib/poptions.h" -#include "plib/ppmf.h" -#include "nl_setup.h" +#include "../plib/pstring.h" +#include "../plib/plists.h" +#include "../plib/pstream.h" +#include "../plib/poptions.h" +#include "../plib/ppmf.h" +#include "../nl_setup.h" class nlwav_options_t : public plib::options { diff --git a/src/lib/netlist/solver/mat_cr.h b/src/lib/netlist/solver/mat_cr.h index c39af1b2f5f..14e4a277dc6 100644 --- a/src/lib/netlist/solver/mat_cr.h +++ b/src/lib/netlist/solver/mat_cr.h @@ -11,8 +11,8 @@ #define MAT_CR_H_ #include <algorithm> -#include "plib/pconfig.h" -#include "plib/palloc.h" +#include "../plib/pconfig.h" +#include "../plib/palloc.h" template<std::size_t N, typename C = uint16_t, typename T = double> struct mat_cr_t diff --git a/src/lib/netlist/solver/nld_matrix_solver.cpp b/src/lib/netlist/solver/nld_matrix_solver.cpp index f314aea2314..d252d554d70 100644 --- a/src/lib/netlist/solver/nld_matrix_solver.cpp +++ b/src/lib/netlist/solver/nld_matrix_solver.cpp @@ -6,7 +6,7 @@ */ #include "nld_matrix_solver.h" -#include "plib/putil.h" +#include "../plib/putil.h" #include <cmath> // <<= needed by windows build diff --git a/src/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h index 82910e9c4d1..ebcdcc2209d 100644 --- a/src/lib/netlist/solver/nld_matrix_solver.h +++ b/src/lib/netlist/solver/nld_matrix_solver.h @@ -8,9 +8,9 @@ #ifndef NLD_MATRIX_SOLVER_H_ #define NLD_MATRIX_SOLVER_H_ -#include "nl_base.h" -#include "nl_errstr.h" -#include "plib/putil.h" +#include "netlist/nl_base.h" +#include "netlist/nl_errstr.h" +#include "netlist/plib/putil.h" namespace netlist { diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h index b929fb6ed22..e9a4e25524d 100644 --- a/src/lib/netlist/solver/nld_ms_direct.h +++ b/src/lib/netlist/solver/nld_ms_direct.h @@ -10,9 +10,9 @@ #include <algorithm> -#include "solver/nld_solver.h" -#include "solver/nld_matrix_solver.h" -#include "solver/vector_base.h" +#include "nld_solver.h" +#include "nld_matrix_solver.h" +#include "vector_base.h" /* Disabling dynamic allocation gives a ~10% boost in performance * This flag has been added to support continuous storage for arrays diff --git a/src/lib/netlist/solver/nld_ms_direct1.h b/src/lib/netlist/solver/nld_ms_direct1.h index 3209ee5bd93..b19990e09d5 100644 --- a/src/lib/netlist/solver/nld_ms_direct1.h +++ b/src/lib/netlist/solver/nld_ms_direct1.h @@ -8,8 +8,8 @@ #ifndef NLD_MS_DIRECT1_H_ #define NLD_MS_DIRECT1_H_ -#include "solver/nld_ms_direct.h" -#include "solver/nld_solver.h" +#include "nld_ms_direct.h" +#include "nld_solver.h" namespace netlist { diff --git a/src/lib/netlist/solver/nld_ms_direct2.h b/src/lib/netlist/solver/nld_ms_direct2.h index 4a2525d1ef7..7561f1d4f64 100644 --- a/src/lib/netlist/solver/nld_ms_direct2.h +++ b/src/lib/netlist/solver/nld_ms_direct2.h @@ -8,8 +8,8 @@ #ifndef NLD_MS_DIRECT2_H_ #define NLD_MS_DIRECT2_H_ -#include "solver/nld_ms_direct.h" -#include "solver/nld_solver.h" +#include "nld_ms_direct.h" +#include "nld_solver.h" namespace netlist { diff --git a/src/lib/netlist/solver/nld_ms_gcr.h b/src/lib/netlist/solver/nld_ms_gcr.h index eda9b14aa74..046e0d897f2 100644 --- a/src/lib/netlist/solver/nld_ms_gcr.h +++ b/src/lib/netlist/solver/nld_ms_gcr.h @@ -12,12 +12,12 @@ #include <algorithm> -#include "plib/pdynlib.h" -#include "solver/mat_cr.h" -#include "solver/nld_ms_direct.h" -#include "solver/nld_solver.h" -#include "solver/vector_base.h" -#include "plib/pstream.h" +#include "../plib/pdynlib.h" +#include "mat_cr.h" +#include "nld_ms_direct.h" +#include "nld_solver.h" +#include "vector_base.h" +#include "../plib/pstream.h" namespace netlist { diff --git a/src/lib/netlist/solver/nld_ms_gmres.h b/src/lib/netlist/solver/nld_ms_gmres.h index a97de6a2446..89fb593cf3c 100644 --- a/src/lib/netlist/solver/nld_ms_gmres.h +++ b/src/lib/netlist/solver/nld_ms_gmres.h @@ -14,10 +14,10 @@ #include <algorithm> -#include "solver/mat_cr.h" -#include "solver/nld_ms_direct.h" -#include "solver/nld_solver.h" -#include "solver/vector_base.h" +#include "mat_cr.h" +#include "nld_ms_direct.h" +#include "nld_solver.h" +#include "vector_base.h" namespace netlist { diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h index b87f5bcc835..71ba1e390d0 100644 --- a/src/lib/netlist/solver/nld_ms_sm.h +++ b/src/lib/netlist/solver/nld_ms_sm.h @@ -35,9 +35,9 @@ #include <algorithm> -#include "solver/nld_solver.h" -#include "solver/nld_matrix_solver.h" -#include "solver/vector_base.h" +#include "nld_solver.h" +#include "nld_matrix_solver.h" +#include "vector_base.h" namespace netlist { diff --git a/src/lib/netlist/solver/nld_ms_sor.h b/src/lib/netlist/solver/nld_ms_sor.h index dc3a5d1821c..5e279b27d67 100644 --- a/src/lib/netlist/solver/nld_ms_sor.h +++ b/src/lib/netlist/solver/nld_ms_sor.h @@ -14,8 +14,8 @@ #include <algorithm> -#include "solver/nld_ms_direct.h" -#include "solver/nld_solver.h" +#include "nld_ms_direct.h" +#include "nld_solver.h" namespace netlist { diff --git a/src/lib/netlist/solver/nld_ms_sor_mat.h b/src/lib/netlist/solver/nld_ms_sor_mat.h index 265ef821957..a63a16bb71b 100644 --- a/src/lib/netlist/solver/nld_ms_sor_mat.h +++ b/src/lib/netlist/solver/nld_ms_sor_mat.h @@ -14,9 +14,9 @@ #include <algorithm> -#include "solver/nld_ms_direct.h" -#include "solver/nld_matrix_solver.h" -#include "solver/nld_solver.h" +#include "nld_ms_direct.h" +#include "nld_matrix_solver.h" +#include "nld_solver.h" namespace netlist { diff --git a/src/lib/netlist/solver/nld_ms_w.h b/src/lib/netlist/solver/nld_ms_w.h index c2e016e4dec..52eccd11204 100644 --- a/src/lib/netlist/solver/nld_ms_w.h +++ b/src/lib/netlist/solver/nld_ms_w.h @@ -42,9 +42,9 @@ #include <algorithm> -#include "solver/nld_solver.h" -#include "solver/nld_matrix_solver.h" -#include "solver/vector_base.h" +#include "nld_solver.h" +#include "nld_matrix_solver.h" +#include "vector_base.h" namespace netlist { diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp index e769797c42e..5c4eb2c7f77 100644 --- a/src/lib/netlist/solver/nld_solver.cpp +++ b/src/lib/netlist/solver/nld_solver.cpp @@ -33,13 +33,13 @@ #include <algorithm> #include <cmath> // <<= needed by windows build -#include "nl_lists.h" +#include "../nl_lists.h" #if HAS_OPENMP #include "omp.h" #endif -#include "nl_factory.h" +#include "../nl_factory.h" #include "nld_solver.h" #include "nld_matrix_solver.h" diff --git a/src/lib/netlist/solver/nld_solver.h b/src/lib/netlist/solver/nld_solver.h index 4f6eb2a21d9..a850cadbb5c 100644 --- a/src/lib/netlist/solver/nld_solver.h +++ b/src/lib/netlist/solver/nld_solver.h @@ -10,9 +10,9 @@ #include <map> -#include "nl_base.h" -#include "plib/pstream.h" -#include "solver/nld_matrix_solver.h" +#include "../nl_base.h" +#include "../plib/pstream.h" +#include "nld_matrix_solver.h" //#define ATTR_ALIGNED(N) __attribute__((aligned(N))) #define ATTR_ALIGNED(N) ATTR_ALIGN diff --git a/src/lib/netlist/solver/vector_base.h b/src/lib/netlist/solver/vector_base.h index b294eb0ee48..b241eb77481 100755 --- a/src/lib/netlist/solver/vector_base.h +++ b/src/lib/netlist/solver/vector_base.h @@ -11,7 +11,7 @@ #define VECTOR_BASE_H_ #include <algorithm> -#include "plib/pconfig.h" +#include "../plib/pconfig.h" #if 0 template <unsigned storage_N> diff --git a/src/lib/netlist/tools/nl_convert.cpp b/src/lib/netlist/tools/nl_convert.cpp index 5b0bfd267c3..acd83a61caf 100644 --- a/src/lib/netlist/tools/nl_convert.cpp +++ b/src/lib/netlist/tools/nl_convert.cpp @@ -9,8 +9,8 @@ #include <cmath> #include <unordered_map> #include "nl_convert.h" -#include "plib/palloc.h" -#include "plib/putil.h" +#include "../plib/palloc.h" +#include "../plib/putil.h" /* FIXME: temporarily defined here - should be in a file */ /* FIXME: family logic in netlist is convoluted, create diff --git a/src/lib/netlist/tools/nl_convert.h b/src/lib/netlist/tools/nl_convert.h index d0d12c377e0..e82e01245b6 100644 --- a/src/lib/netlist/tools/nl_convert.h +++ b/src/lib/netlist/tools/nl_convert.h @@ -11,9 +11,9 @@ #define NL_CONVERT_H_ #include <memory> -#include "plib/pstring.h" -#include "plib/plists.h" -#include "plib/pparser.h" +#include "../plib/pstring.h" +#include "../plib/plists.h" +#include "../plib/pparser.h" /*------------------------------------------------- convert - convert a spice netlist |