aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorcbdev <cb@cbcdn.com>2021-06-21 22:15:15 +0200
committercbdev <cb@cbcdn.com>2021-06-21 22:15:15 +0200
commita743153aafffb38a6d8765d1f1c634dde51d5558 (patch)
tree3cbc9910e5216953b16cf26c98751fbb370e3b54
parent921ce069a4770fbadad7bb4e806361e857469409 (diff)
downloadmidimonster-a743153aafffb38a6d8765d1f1c634dde51d5558.tar.gz
midimonster-a743153aafffb38a6d8765d1f1c634dde51d5558.tar.bz2
midimonster-a743153aafffb38a6d8765d1f1c634dde51d5558.zip
Repository cleanup, part 2
-rw-r--r--Makefile18
-rw-r--r--assets/MIDIMonster.svg (renamed from MIDIMonster.svg)0
-rw-r--r--assets/TODO (renamed from TODO)0
-rw-r--r--assets/ci-config.yml (renamed from .travis.yml)0
-rwxr-xr-xassets/ci.sh (renamed from .ci.sh)0
-rw-r--r--assets/midimonster.1 (renamed from midimonster.1)0
-rw-r--r--assets/midimonster.ico (renamed from midimonster.ico)bin321510 -> 321510 bytes
-rw-r--r--assets/midimonster.rc (renamed from midimonster.rc)0
-rw-r--r--midimonster.c6
9 files changed, 14 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 9b95f1b..50fc73e 100644
--- a/Makefile
+++ b/Makefile
@@ -11,14 +11,18 @@ GITVERSION = $(shell git describe)
CFLAGS ?= -g -Wall -Wpedantic
#CFLAGS += -DDEBUG
# Hide all non-API symbols for export
-CFLAGS += -fvisibility=hidden -I./
+CFLAGS += -fvisibility=hidden
+
+# Subdirectory objects need the include path
+RCCFLAGS += -I./
+CFLAGS += -I./
midimonster: LDLIBS = -ldl
# Replace version string with current git-describe if possible
ifneq "$(GITVERSION)" ""
midimonster: CFLAGS += -DMIDIMONSTER_VERSION=\"$(GITVERSION)\"
midimonster.exe: CFLAGS += -DMIDIMONSTER_VERSION=\"$(GITVERSION)\"
-resource.o: RCCFLAGS += -DMIDIMONSTER_VERSION=\\\"$(GITVERSION)\\\"
+assets/resource.o: RCCFLAGS += -DMIDIMONSTER_VERSION=\\\"$(GITVERSION)\\\"
endif
# Work around strange linker passing convention differences in Linux and OSX
@@ -55,10 +59,10 @@ backends-full:
midimonster: midimonster.c portability.h $(OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) $< $(OBJS) $(LDLIBS) -o $@
-resource.o: midimonster.rc midimonster.ico
+assets/resource.o: assets/midimonster.rc assets/midimonster.ico
$(RCC) $(RCCFLAGS) $< -o $@ --output-format=coff
-midimonster.ico: MIDIMonster.svg
+assets/midimonster.ico: assets/MIDIMonster.svg
convert -density 384 $< -define icon:auto-resize $@
midimonster.exe: export CC = x86_64-w64-mingw32-gcc
@@ -66,14 +70,14 @@ 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
-midimonster.exe: midimonster.c portability.h $(OBJS) resource.o
- $(CC) $(CFLAGS) $(LDFLAGS) $< $(OBJS) resource.o $(LDLIBS) -o $@
+midimonster.exe: midimonster.c portability.h $(OBJS) assets/resource.o
+ $(CC) $(CFLAGS) $(LDFLAGS) $< $(OBJS) assets/resource.o $(LDLIBS) -o $@
clean:
$(RM) midimonster
$(RM) midimonster.exe
$(RM) libmmapi.a
- $(RM) resource.o
+ $(RM) assets/resource.o
$(RM) $(OBJS)
$(MAKE) -C backends clean
diff --git a/MIDIMonster.svg b/assets/MIDIMonster.svg
index 7e411dc..7e411dc 100644
--- a/MIDIMonster.svg
+++ b/assets/MIDIMonster.svg
diff --git a/TODO b/assets/TODO
index 9158e24..9158e24 100644
--- a/TODO
+++ b/assets/TODO
diff --git a/.travis.yml b/assets/ci-config.yml
index 9fbe236..9fbe236 100644
--- a/.travis.yml
+++ b/assets/ci-config.yml
diff --git a/.ci.sh b/assets/ci.sh
index 4a646a9..4a646a9 100755
--- a/.ci.sh
+++ b/assets/ci.sh
diff --git a/midimonster.1 b/assets/midimonster.1
index 44c414e..44c414e 100644
--- a/midimonster.1
+++ b/assets/midimonster.1
diff --git a/midimonster.ico b/assets/midimonster.ico
index 9391160..9391160 100644
--- a/midimonster.ico
+++ b/assets/midimonster.ico
Binary files differ
diff --git a/midimonster.rc b/assets/midimonster.rc
index 45a88aa..45a88aa 100644
--- a/midimonster.rc
+++ b/assets/midimonster.rc
diff --git a/midimonster.c b/midimonster.c
index 3849953..51fe7ad 100644
--- a/midimonster.c
+++ b/midimonster.c
@@ -12,9 +12,9 @@
#define BACKEND_NAME "core"
#define MM_SWAP_LIMIT 20
#include "midimonster.h"
-#include "config.h"
-#include "backend.h"
-#include "plugin.h"
+#include "core/config.h"
+#include "core/backend.h"
+#include "core/plugin.h"
/* Core-internal structures */
typedef struct /*_event_collection*/ {