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

Merge branch 'pre-master' of ssh://git.code.sf.net/p/ngspice/ngspice into pre-master

This commit is contained in:
Holger Vogt 2020-10-04 14:00:45 +02:00
parent d6d0217acb 4c32f00b4e
commit 08ab6342d9
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compile_min.sh
View File

@ -70,10 +70,10 @@ echo "cleaning (see make_clean.log)"
make clean 2>&1 -j8 | tee make_clean.log
exitcode=${PIPESTATUS[0]}
if [ $exitcode -ne 0 ]; then echo "make clean failed"; exit 1 ; fi
echo "compiling the icon"
windres ../src/ngicon.rc -O coff -o ./src/ngicon.o
exitcode=${PIPESTATUS[0]}
if [ $exitcode -ne 0 ]; then echo "compiling the icon failed"; exit 1 ; fi
# echo "compiling the icon"
# windres ../src/ngicon.rc -O coff -o ./src/ngicon.o
# exitcode=${PIPESTATUS[0]}
# if [ $exitcode -ne 0 ]; then echo "compiling the icon failed"; exit 1 ; fi
echo "compiling (see make.log)"
make 2>&1 -j8 | tee make.log
exitcode=${PIPESTATUS[0]}

10
src/Makefile.am
View File

@ -102,6 +102,16 @@ DYNAMIC_DEVICELIBS = \
## Build ngspice first:
## compile the icon:
if WINGUI
ngicon.o: ngicon.rc
windres $(srcdir)/ngicon.rc -O coff -o ngicon.o
endif
if WINCONSOLE
ngicon.o: ngicon.rc
windres $(srcdir)/ngicon.rc -O coff -o ngicon.o
endif
ngspice_SOURCES = \
main.c \
conf.c \