From 3098484d9d8ab3becd6d82297c13963f359460f4 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Wed, 1 Jan 2020 20:16:52 +0100
Subject: Do not install default config if already present (Fixes #43)

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 990aec3..27f7994 100644
--- a/Makefile
+++ b/Makefile
@@ -79,8 +79,10 @@ install:
 	install -d "$(DESTDIR)$(EXAMPLES)"
 	install -m 0644 configs/* "$(DESTDIR)$(EXAMPLES)"
 ifdef DEFAULT_CFG
+ifeq (,$(wildcard $(DEFAULT_CFG)))
 	install -Dm 0644 monster.cfg "$(DESTDIR)$(DEFAULT_CFG)"
 endif
+endif
 
 sanitize: export CC = clang
 sanitize: export CFLAGS += -g -Wall -Wpedantic -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer
-- 
cgit v1.2.3


From fa738ea4a3d78046c100fd953f33bbc902821d67 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Fri, 17 Jan 2020 19:43:08 +0100
Subject: Add project logo and initial Windows resource data

---
 Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 27f7994..6a835ac 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ midimonster: LDLIBS = -ldl
 ifneq "$(GITVERSION)" ""
 midimonster: CFLAGS += -DMIDIMONSTER_VERSION=\"$(GITVERSION)\"
 midimonster.exe: CFLAGS += -DMIDIMONSTER_VERSION=\"$(GITVERSION)\"
+resource.o: RCCFLAGS += -DMIDIMONSTER_VERSION=\\\"$(GITVERSION)\\\"
 endif
 
 # Work around strange linker passing convention differences in Linux and OSX
@@ -54,17 +55,21 @@ 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
+
 midimonster.exe: export CC = x86_64-w64-mingw32-gcc
 midimonster.exe: CFLAGS += -Wno-format
 midimonster.exe: LDLIBS = -lws2_32
 midimonster.exe: LDFLAGS += -Wl,--out-implib,libmmapi.a
-midimonster.exe: midimonster.c portability.h $(OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) $< $(OBJS) $(LDLIBS) -o $@
+midimonster.exe: midimonster.c portability.h $(OBJS) resource.o
+	$(CC) $(CFLAGS) $(LDFLAGS) $< $(OBJS) resource.o $(LDLIBS) -o $@
 
 clean:
 	$(RM) midimonster
 	$(RM) midimonster.exe
 	$(RM) libmmapi.a
+	$(RM) resource.o
 	$(RM) $(OBJS)
 	$(MAKE) -C backends clean
 
-- 
cgit v1.2.3


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

---
 Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Makefile')

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
-- 
cgit v1.2.3