From 031b722640c8bb4be8fa2f6c77c6d43d2a16e1c8 Mon Sep 17 00:00:00 2001 From: Jim Monte Date: Sat, 1 Jun 2019 18:39:16 +0200 Subject: [PATCH] [PATCH #56-2] Added hist_info source and header files for new history API and system DLL Shlwapi.dll to resolve PathIsRelative() --- src/Makefile.am | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 9d893f68f..c3ecdf00c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,7 +33,8 @@ endif !SHARED_MODULE endif !TCL_MODULE EXTRA_DIST = ngspice.txt setplot spectrum \ - devload devaxis ciderinit winmain.c winmain.h \ + devload devaxis ciderinit \ + hist_info.c hist_info.h winmain.c winmain.h \ tclspice.c tclspice.map pkgIndex.tcl.in spinit.in tclspinit.in \ main.c sharedspice.c @@ -110,7 +111,7 @@ ngspice_SOURCES = \ ngspice_CPPFLAGS = $(AM_CPPFLAGS) -DSIMULATOR if WINGUI -ngspice_SOURCES += winmain.c +ngspice_SOURCES += winmain.c hist_info.c endif ngspice_LDADD = \ @@ -202,7 +203,7 @@ ngnutmeg_SOURCES = \ ngnutmeg_CPPFLAGS = $(AM_CPPFLAGS) if WINGUI -ngnutmeg_SOURCES += winmain.c +ngnutmeg_SOURCES += winmain.c hist_info.c endif ngnutmeg_LDADD = \ @@ -331,16 +332,16 @@ AM_CFLAGS = -static LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@ if WINGUI -LIBS += -lpsapi +LIBS += -lpsapi -lShlwapi endif if WINCONSOLE -LIBS += -lpsapi +LIBS += -lpsapi -lShlwapi endif ## FIXME: Should be allwed, but fails within MSYS2 #if SHWIN -#LIBS += -lpsapi +#LIBS += -lpsapi -lShlwapi #endif CLEANFILES = ngspice.idx spinit tclspinit pkgIndex.tcl @@ -356,7 +357,7 @@ pkgIndex_DATA = pkgIndex.tcl pkgIndexdir = $(pkglibdir) if TCLWIN -LIBS += -lpsapi -ltcl84 -lBLT24 +LIBS += -lpsapi -lShlwapi -ltcl84 -lBLT24 endif libspice_la_SOURCES = \