luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH #56-2] Added hist_info source and header files for new history API 

and system DLL Shlwapi.dll to resolve PathIsRelative()
This commit is contained in:
Jim Monte 2019-06-01 18:39:16 +02:00 committed by Holger Vogt
parent 3874916948
commit 031b722640
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Makefile.am
View File

@ -33,7 +33,8 @@ endif !SHARED_MODULE
endif !TCL_MODULE endif !TCL_MODULE
EXTRA_DIST = ngspice.txt setplot spectrum \ 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 \ tclspice.c tclspice.map pkgIndex.tcl.in spinit.in tclspinit.in \
main.c sharedspice.c main.c sharedspice.c
@ -110,7 +111,7 @@ ngspice_SOURCES = \
ngspice_CPPFLAGS = $(AM_CPPFLAGS) -DSIMULATOR ngspice_CPPFLAGS = $(AM_CPPFLAGS) -DSIMULATOR
if WINGUI if WINGUI
ngspice_SOURCES += winmain.c ngspice_SOURCES += winmain.c hist_info.c
endif endif
ngspice_LDADD = \ ngspice_LDADD = \
@ -202,7 +203,7 @@ ngnutmeg_SOURCES = \
ngnutmeg_CPPFLAGS = $(AM_CPPFLAGS) ngnutmeg_CPPFLAGS = $(AM_CPPFLAGS)
if WINGUI if WINGUI
ngnutmeg_SOURCES += winmain.c ngnutmeg_SOURCES += winmain.c hist_info.c
endif endif
ngnutmeg_LDADD = \ ngnutmeg_LDADD = \
@ -331,16 +332,16 @@ AM_CFLAGS = -static
LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@ LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@
if WINGUI if WINGUI
LIBS += -lpsapi LIBS += -lpsapi -lShlwapi
endif endif
if WINCONSOLE if WINCONSOLE
LIBS += -lpsapi LIBS += -lpsapi -lShlwapi
endif endif
## FIXME: Should be allwed, but fails within MSYS2 ## FIXME: Should be allwed, but fails within MSYS2
#if SHWIN #if SHWIN
#LIBS += -lpsapi #LIBS += -lpsapi -lShlwapi
#endif #endif
CLEANFILES = ngspice.idx spinit tclspinit pkgIndex.tcl CLEANFILES = ngspice.idx spinit tclspinit pkgIndex.tcl
@ -356,7 +357,7 @@ pkgIndex_DATA = pkgIndex.tcl
pkgIndexdir = $(pkglibdir) pkgIndexdir = $(pkglibdir)
if TCLWIN if TCLWIN
LIBS += -lpsapi -ltcl84 -lBLT24 LIBS += -lpsapi -lShlwapi -ltcl84 -lBLT24
endif endif
libspice_la_SOURCES = \ libspice_la_SOURCES = \