diff --git a/compile_min.sh b/compile_min.sh index 1390a840c..606642aed 100755 --- a/compile_min.sh +++ b/compile_min.sh @@ -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]} diff --git a/src/Makefile.am b/src/Makefile.am index a8fb22e6a..2e9a68ef2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 \