Browse Source

Move compiling the ICON from compile_mingw.sh to makefile.am

fixes bug no. #516
pre-master-46
Holger Vogt 6 years ago
parent
commit
ef7f43a060
  1. 8
      compile_min.sh
  2. 10
      src/Makefile.am

8
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]}

10
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 \

Loading…
Cancel
Save