starred/mt32-pi-dwhinham
1
0
Fork 0
mirror of https://github.com/dwhinham/mt32-pi.git synced 2026-02-04 00:04:35 +00:00
Code Issues 49 Packages Projects Releases 20 Wiki Activity

Makefile: Fix indentation

Browse Source
This commit is contained in:
Dale Whinham
2023-03-03 21:13:17 +00:00
parent e60d4b39ee
commit 919696b41d
3 changed files with 95 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Config.mk
View File

@@ -71,18 +71,18 @@ CIRCLE_CONFIG=$(CIRCLEHOME)/Config.mk
NEWLIB_ARCH=$(firstword $(subst -, ,$(PREFIX)))-none-circle NEWLIB_ARCH=$(firstword $(subst -, ,$(PREFIX)))-none-circle
NEWLIBDIR=$(CIRCLESTDLIBHOME)/install/$(NEWLIB_ARCH) NEWLIBDIR=$(CIRCLESTDLIBHOME)/install/$(NEWLIB_ARCH)
CIRCLE_STDLIB_LIBS=$(NEWLIBDIR)/lib/libm.a \ CIRCLE_STDLIB_LIBS=$(NEWLIBDIR)/lib/libm.a \
$(NEWLIBDIR)/lib/libc.a \ $(NEWLIBDIR)/lib/libc.a \
$(NEWLIBDIR)/lib/libcirclenewlib.a $(NEWLIBDIR)/lib/libcirclenewlib.a
BOOTHOME=$(CIRCLEHOME)/boot BOOTHOME=$(CIRCLEHOME)/boot
BOOT_FILES=$(BOOTHOME)/bcm2711-rpi-4-b.dtb \ BOOT_FILES=$(BOOTHOME)/bcm2711-rpi-4-b.dtb \
$(BOOTHOME)/bootcode.bin \ $(BOOTHOME)/bootcode.bin \
$(BOOTHOME)/COPYING.linux \ $(BOOTHOME)/COPYING.linux \
$(BOOTHOME)/fixup4.dat \ $(BOOTHOME)/fixup4.dat \
$(BOOTHOME)/fixup.dat \ $(BOOTHOME)/fixup.dat \
$(BOOTHOME)/LICENCE.broadcom \ $(BOOTHOME)/LICENCE.broadcom \
$(BOOTHOME)/start4.elf \ $(BOOTHOME)/start4.elf \
$(BOOTHOME)/start.elf $(BOOTHOME)/start.elf
MT32EMUHOME=$(realpath external/munt/mt32emu) MT32EMUHOME=$(realpath external/munt/mt32emu)
MT32EMUBUILDDIR=build-munt MT32EMUBUILDDIR=build-munt

98
Kernel.mk
View File

@@ -5,40 +5,40 @@
include Config.mk include Config.mk
OBJS := src/config.o \ OBJS := src/config.o \
src/control/control.o \ src/control/control.o \
src/control/mister.o \ src/control/mister.o \
src/control/rotaryencoder.o \ src/control/rotaryencoder.o \
src/control/simplebuttons.o \ src/control/simplebuttons.o \
src/control/simpleencoder.o \ src/control/simpleencoder.o \
src/kernel.o \ src/kernel.o \
src/lcd/drivers/hd44780.o \ src/lcd/drivers/hd44780.o \
src/lcd/drivers/hd44780fourbit.o \ src/lcd/drivers/hd44780fourbit.o \
src/lcd/drivers/hd44780i2c.o \ src/lcd/drivers/hd44780i2c.o \
src/lcd/drivers/sh1106.o \ src/lcd/drivers/sh1106.o \
src/lcd/drivers/ssd1306.o \ src/lcd/drivers/ssd1306.o \
src/lcd/ui.o \ src/lcd/ui.o \
src/main.o \ src/main.o \
src/midimonitor.o \ src/midimonitor.o \
src/midiparser.o \ src/midiparser.o \
src/mt32pi.o \ src/mt32pi.o \
src/net/applemidi.o \ src/net/applemidi.o \
src/net/ftpdaemon.o \ src/net/ftpdaemon.o \
src/net/ftpworker.o \ src/net/ftpworker.o \
src/net/udpmidi.o \ src/net/udpmidi.o \
src/pisound.o \ src/pisound.o \
src/power.o \ src/power.o \
src/rommanager.o \ src/rommanager.o \
src/soundfontmanager.o \ src/soundfontmanager.o \
src/synth/mt32synth.o \ src/synth/mt32synth.o \
src/synth/soundfontsynth.o \ src/synth/soundfontsynth.o \
src/zoneallocator.o src/zoneallocator.o
EXTRACLEAN += src/*.d src/*.o \ EXTRACLEAN += src/*.d src/*.o \
src/control/*.d src/control/*.o \ src/control/*.d src/control/*.o \
src/lcd/*.d src/lcd/*.o \ src/lcd/*.d src/lcd/*.o \
src/lcd/drivers/*.d src/lcd/drivers/*.o \ src/lcd/drivers/*.d src/lcd/drivers/*.o \
src/net/*.d src/net/*.o \ src/net/*.d src/net/*.o \
src/synth/*.d src/synth/*.o src/synth/*.d src/synth/*.o
# #
# inih # inih
@@ -46,30 +46,30 @@ EXTRACLEAN += src/*.d src/*.o \
OBJS += $(INIHHOME)/ini.o OBJS += $(INIHHOME)/ini.o
INCLUDE += -I $(INIHHOME) INCLUDE += -I $(INIHHOME)
EXTRACLEAN += $(INIHHOME)/ini.d \ EXTRACLEAN += $(INIHHOME)/ini.d \
$(INIHHOME)/ini.o $(INIHHOME)/ini.o
include $(CIRCLEHOME)/Rules.mk include $(CIRCLEHOME)/Rules.mk
CFLAGS += -Werror -Wextra -Wno-unused-parameter CFLAGS += -Werror -Wextra -Wno-unused-parameter
CFLAGS += -I "$(NEWLIBDIR)/include" \ CFLAGS += -I "$(NEWLIBDIR)/include" \
-I $(STDDEF_INCPATH) \ -I $(STDDEF_INCPATH) \
-I $(CIRCLESTDLIBHOME)/include \ -I $(CIRCLESTDLIBHOME)/include \
-I include \ -I include \
-I . -I .
LIBS := $(CIRCLE_STDLIB_LIBS) \ LIBS := $(CIRCLE_STDLIB_LIBS) \
$(CIRCLEHOME)/addon/fatfs/libfatfs.a \ $(CIRCLEHOME)/addon/fatfs/libfatfs.a \
$(CIRCLEHOME)/addon/SDCard/libsdcard.a \ $(CIRCLEHOME)/addon/SDCard/libsdcard.a \
$(CIRCLEHOME)/addon/wlan/hostap/wpa_supplicant/libwpa_supplicant.a \ $(CIRCLEHOME)/addon/wlan/hostap/wpa_supplicant/libwpa_supplicant.a \
$(CIRCLEHOME)/addon/wlan/libwlan.a \ $(CIRCLEHOME)/addon/wlan/libwlan.a \
$(CIRCLEHOME)/lib/fs/libfs.a \ $(CIRCLEHOME)/lib/fs/libfs.a \
$(CIRCLEHOME)/lib/input/libinput.a \ $(CIRCLEHOME)/lib/input/libinput.a \
$(CIRCLEHOME)/lib/libcircle.a \ $(CIRCLEHOME)/lib/libcircle.a \
$(CIRCLEHOME)/lib/net/libnet.a \ $(CIRCLEHOME)/lib/net/libnet.a \
$(CIRCLEHOME)/lib/sched/libsched.a \ $(CIRCLEHOME)/lib/sched/libsched.a \
$(CIRCLEHOME)/lib/sound/libsound.a \ $(CIRCLEHOME)/lib/sound/libsound.a \
$(CIRCLEHOME)/lib/usb/libusb.a $(CIRCLEHOME)/lib/usb/libusb.a
ifeq ($(HDMI_CONSOLE), 1) ifeq ($(HDMI_CONSOLE), 1)
DEFINE += -D HDMI_CONSOLE DEFINE += -D HDMI_CONSOLE
@@ -81,7 +81,7 @@ INCLUDE += -I $(MT32EMUBUILDDIR)/include
EXTRALIBS += $(MT32EMULIB) EXTRALIBS += $(MT32EMULIB)
INCLUDE += -I $(FLUIDSYNTHBUILDDIR)/include \ INCLUDE += -I $(FLUIDSYNTHBUILDDIR)/include \
-I $(FLUIDSYNTHHOME)/include -I $(FLUIDSYNTHHOME)/include
EXTRALIBS += $(FLUIDSYNTHLIB) EXTRALIBS += $(FLUIDSYNTHLIB)
# #

74
Makefile
View File

@@ -79,14 +79,14 @@ mt32emu: $(MT32EMUBUILDDIR)/.done
$(MT32EMUBUILDDIR)/.done: $(CIRCLESTDLIBHOME)/.done $(MT32EMUBUILDDIR)/.done: $(CIRCLESTDLIBHOME)/.done
@CFLAGS="$(CFLAGS_EXTERNAL)" \ @CFLAGS="$(CFLAGS_EXTERNAL)" \
CXXFLAGS="$(CFLAGS_EXTERNAL)" \ CXXFLAGS="$(CFLAGS_EXTERNAL)" \
cmake -B $(MT32EMUBUILDDIR) \ cmake -B $(MT32EMUBUILDDIR) \
$(CMAKE_TOOLCHAIN_FLAGS) \ $(CMAKE_TOOLCHAIN_FLAGS) \
-DCMAKE_CXX_FLAGS_RELEASE="-Ofast" \ -DCMAKE_CXX_FLAGS_RELEASE="-Ofast" \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-Dlibmt32emu_C_INTERFACE=FALSE \ -Dlibmt32emu_C_INTERFACE=FALSE \
-Dlibmt32emu_SHARED=FALSE \ -Dlibmt32emu_SHARED=FALSE \
$(MT32EMUHOME) \ $(MT32EMUHOME) \
>/dev/null >/dev/null
@cmake --build $(MT32EMUBUILDDIR) @cmake --build $(MT32EMUBUILDDIR)
@touch $@ @touch $@
@@ -99,35 +99,35 @@ $(FLUIDSYNTHBUILDDIR)/.done: $(CIRCLESTDLIBHOME)/.done
@${APPLY_PATCH} $(FLUIDSYNTHHOME) patches/fluidsynth-2.3.1-circle.patch @${APPLY_PATCH} $(FLUIDSYNTHHOME) patches/fluidsynth-2.3.1-circle.patch
@CFLAGS="$(CFLAGS_EXTERNAL)" \ @CFLAGS="$(CFLAGS_EXTERNAL)" \
cmake -B $(FLUIDSYNTHBUILDDIR) \ cmake -B $(FLUIDSYNTHBUILDDIR) \
$(CMAKE_TOOLCHAIN_FLAGS) \ $(CMAKE_TOOLCHAIN_FLAGS) \
-DCMAKE_C_FLAGS_RELEASE="-Ofast -fopenmp-simd" \ -DCMAKE_C_FLAGS_RELEASE="-Ofast -fopenmp-simd" \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=OFF \ -DBUILD_SHARED_LIBS=OFF \
-Denable-aufile=OFF \ -Denable-aufile=OFF \
-Denable-dbus=OFF \ -Denable-dbus=OFF \
-Denable-dsound=OFF \ -Denable-dsound=OFF \
-Denable-floats=ON \ -Denable-floats=ON \
-Denable-ipv6=OFF \ -Denable-ipv6=OFF \
-Denable-jack=OFF \ -Denable-jack=OFF \
-Denable-ladspa=OFF \ -Denable-ladspa=OFF \
-Denable-libinstpatch=OFF \ -Denable-libinstpatch=OFF \
-Denable-libsndfile=OFF \ -Denable-libsndfile=OFF \
-Denable-midishare=OFF \ -Denable-midishare=OFF \
-Denable-network=OFF \ -Denable-network=OFF \
-Denable-oboe=OFF \ -Denable-oboe=OFF \
-Denable-openmp=OFF \ -Denable-openmp=OFF \
-Denable-opensles=OFF \ -Denable-opensles=OFF \
-Denable-oss=OFF \ -Denable-oss=OFF \
-Denable-pipewire=OFF \ -Denable-pipewire=OFF \
-Denable-pulseaudio=OFF \ -Denable-pulseaudio=OFF \
-Denable-readline=OFF \ -Denable-readline=OFF \
-Denable-sdl2=OFF \ -Denable-sdl2=OFF \
-Denable-threads=OFF \ -Denable-threads=OFF \
-Denable-waveout=OFF \ -Denable-waveout=OFF \
-Denable-winmidi=OFF \ -Denable-winmidi=OFF \
$(FLUIDSYNTHHOME) \ $(FLUIDSYNTHHOME) \
>/dev/null >/dev/null
@cmake --build $(FLUIDSYNTHBUILDDIR) --target libfluidsynth @cmake --build $(FLUIDSYNTHBUILDDIR) --target libfluidsynth
@touch $@ @touch $@