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

revert commit 194bb and let configure do the job

This commit is contained in:
dwarning 2020-03-26 12:20:41 +01:00 committed by Holger Vogt
parent 57d3ad7ab3
commit ada7c54263
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compile_min.sh
View File

@ -56,14 +56,14 @@ if test "$1" = "32"; then
echo "configuring for 32 bit"
echo
# You may add --enable-adms to the following command for adding adms generated devices
../configure --with-wingui --enable-xspice --enable-cider --enable-openmp --disable-debug prefix="C:/Spice" CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 -m32 -O2" LDFLAGS="-m32 -s -lshlwapi -lpsapi"
../configure --with-wingui --enable-xspice --enable-cider --enable-openmp --disable-debug prefix="C:/Spice" CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 -m32 -O2" LDFLAGS="-m32 -s"
else
cd release
if [ $? -ne 0 ]; then echo "cd release failed"; exit 1 ; fi
echo "configuring for 64 bit"
echo
# You may add --enable-adms to the following command for adding adms generated devices
../configure --with-wingui --enable-xspice --enable-cider --enable-openmp --disable-debug prefix="C:/Spice64" CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 -m64 -O2" LDFLAGS="-m64 -s -lshlwapi -lpsapi"
../configure --with-wingui --enable-xspice --enable-cider --enable-openmp --disable-debug prefix="C:/Spice64" CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 -m64 -O2" LDFLAGS="-m64 -s"
fi
if [ $? -ne 0 ]; then echo "../configure failed"; exit 1 ; fi

4
compile_min_shared.sh
View File

@ -54,14 +54,14 @@ if test "$1" = "64"; then
echo "configuring for 64 bit"
echo
# You may add --enable-adms to the following command for adding adms generated devices
../configure --with-ngshared --enable-xspice --enable-cider --enable-openmp --enable-relpath --disable-debug prefix="C:/Spice64" CFLAGS="-m64 -O2" LDFLAGS="-m64 -s -lshlwapi -lpsapi"
../configure --with-ngshared --enable-xspice --enable-cider --enable-openmp --enable-relpath --disable-debug prefix="C:/Spice64" CFLAGS="-m64 -O2" LDFLAGS="-m64 -s"
else
cd release-sh
if [ $? -ne 0 ]; then echo "cd release-sh failed"; exit 1 ; fi
echo "configuring for 32 bit"
echo
# You may add --enable-adms to the following command for adding adms generated devices
../configure --with-ngshared --enable-xspice --enable-cider --enable-openmp --enable-relpath --disable-debug prefix="C:/Spice" CFLAGS="-m32 -O2" LDFLAGS="-m32 -s -lshlwapi -lpsapi"
../configure --with-ngshared --enable-xspice --enable-cider --enable-openmp --enable-relpath --disable-debug prefix="C:/Spice" CFLAGS="-m32 -O2" LDFLAGS="-m32 -s"
fi
if [ $? -ne 0 ]; then echo "../configure failed"; exit 1 ; fi

6
configure.ac
View File

@ -342,6 +342,12 @@ if test "x$with_ngshared" != x && test "x$with_ngshared" != xno ; then
*mingw* | *msys* )
has_shwin=true
has_no_help=true
AC_CHECK_FUNCS([PathIsRelativeA], [],
[AC_CHECK_LIB([shlwapi], [PathIsRelativeA],
[LIBS="$LIBS -lshlwapi"])])
AC_CHECK_FUNCS([GetProcessMemoryInfo], [],
[AC_CHECK_LIB([psapi], [GetProcessMemoryInfo],
[LIBS="$LIBS -lpsapi"])])
;;
*cygwin* )
has_shcyg=true