From 1b3878956f02e274c480815774f9c6f39d65117f Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Wed, 26 Feb 2020 00:04:55 +0100
Subject: Use (spell-)lintian from package repositories in CI

---
 .travis.yml         | 2 +-
 Makefile            | 9 +++++++--
 backends/loopback.c | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5c0a3ec..e311a5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,7 @@ addons:
      - libjack-jackd2-dev
      - liblua5.3-dev
      - libssl-dev
+     - lintian
     packages: &core_build_gpp_latest
      - *core_build
      - gcc-8
@@ -197,7 +198,6 @@ before_install:
  - $CC --version
 #OS X uses something other than $CXX variable
  - if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "sanitize" \) ]; then $CXX --version; fi
- - if [ "$TASK" == "spellintian" -o "$TASK" == "spellintian-duplicates" ]; then wget "http://archive.ubuntu.com/ubuntu/pool/main/l/lintian/lintian_2.5.104_all.deb"; sudo dpkg -i lintian_*.deb; sudo apt-get install -f -y; fi # Install a later lintian
 # Download libraries to link with on Windows
  - if [ "$TASK" == "windows" ]; then mkdir libs; wget "https://downloads.sourceforge.net/project/luabinaries/5.3.5/Windows%20Libraries/Dynamic/lua-5.3.5_Win64_dllw6_lib.zip" -O lua53.zip; unzip lua53.zip lua53.dll; mv lua53.dll libs; fi
 
diff --git a/Makefile b/Makefile
index 6a835ac..bda7bb1 100644
--- a/Makefile
+++ b/Makefile
@@ -55,10 +55,14 @@ backends-full:
 midimonster: midimonster.c portability.h $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) $< $(OBJS) $(LDLIBS) -o $@
 
-resource.o: midimonster.rc
-	x86_64-w64-mingw32-windres $(RCCFLAGS) $< -o $@ --output-format=coff
+resource.o: midimonster.rc midimonster.ico
+	$(RCC) $(RCCFLAGS) $< -o $@ --output-format=coff
+
+midimonster.ico: MIDIMonster.svg
+	convert -density 384 $< -define icon:auto-resize $@
 
 midimonster.exe: export CC = x86_64-w64-mingw32-gcc
+midimonster.exe: RCC ?= x86_64-w64-mingw32-windres
 midimonster.exe: CFLAGS += -Wno-format
 midimonster.exe: LDLIBS = -lws2_32
 midimonster.exe: LDFLAGS += -Wl,--out-implib,libmmapi.a
@@ -84,6 +88,7 @@ install:
 	install -d "$(DESTDIR)$(EXAMPLES)"
 	install -m 0644 configs/* "$(DESTDIR)$(EXAMPLES)"
 ifdef DEFAULT_CFG
+# Only install the default configuration if it is not already present to avoid overwriting it
 ifeq (,$(wildcard $(DEFAULT_CFG)))
 	install -Dm 0644 monster.cfg "$(DESTDIR)$(DEFAULT_CFG)"
 endif
diff --git a/backends/loopback.c b/backends/loopback.c
index eaecdb4..4274832 100644
--- a/backends/loopback.c
+++ b/backends/loopback.c
@@ -102,6 +102,7 @@ static int loopback_shutdown(size_t n, instance** inst){
 		}
 		free(data->name);
 		free(inst[u]->impl);
+		inst[u]->impl = NULL;
 	}
 
 	LOG("Backend shut down");
-- 
cgit v1.2.3