From c076c932b4178a0a58609a3b982af70a8a02c846 Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Sun, 29 Mar 2020 16:07:32 +0200 Subject: [PATCH] enable MINGW linking to -lShlwapi, which failed during making 32 bit shared lib --- src/Makefile.am | 7 +++---- src/xspice/cmpp/Makefile.am | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 60649913a..28e50cb24 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -349,10 +349,9 @@ if WINCONSOLE LIBS += -lpsapi -lShlwapi endif -## FIXME: Should be allwed, but fails within MSYS2 -#if SHWIN -#LIBS += -lpsapi -lShlwapi -#endif +if SHWIN +LIBS += -lpsapi -lShlwapi +endif CLEANFILES = ngspice.idx spinit tclspinit pkgIndex.tcl diff --git a/src/xspice/cmpp/Makefile.am b/src/xspice/cmpp/Makefile.am index c858a3348..d8ee5cafd 100644 --- a/src/xspice/cmpp/Makefile.am +++ b/src/xspice/cmpp/Makefile.am @@ -24,6 +24,10 @@ if WINCONSOLE cmpp_LDADD = -lShlwapi endif +if SHWIN +cmpp_LDADD = -lShlwapi +endif + mod_lex.c : mod_lex.l $(am__skiplex) $(LEXCOMPILE) -o $@ $<