diff --git a/Config.mk b/Config.mk index 43b70f7..57c0049 100644 --- a/Config.mk +++ b/Config.mk @@ -71,18 +71,18 @@ CIRCLE_CONFIG=$(CIRCLEHOME)/Config.mk NEWLIB_ARCH=$(firstword $(subst -, ,$(PREFIX)))-none-circle NEWLIBDIR=$(CIRCLESTDLIBHOME)/install/$(NEWLIB_ARCH) CIRCLE_STDLIB_LIBS=$(NEWLIBDIR)/lib/libm.a \ - $(NEWLIBDIR)/lib/libc.a \ - $(NEWLIBDIR)/lib/libcirclenewlib.a + $(NEWLIBDIR)/lib/libc.a \ + $(NEWLIBDIR)/lib/libcirclenewlib.a BOOTHOME=$(CIRCLEHOME)/boot BOOT_FILES=$(BOOTHOME)/bcm2711-rpi-4-b.dtb \ - $(BOOTHOME)/bootcode.bin \ - $(BOOTHOME)/COPYING.linux \ - $(BOOTHOME)/fixup4.dat \ - $(BOOTHOME)/fixup.dat \ - $(BOOTHOME)/LICENCE.broadcom \ - $(BOOTHOME)/start4.elf \ - $(BOOTHOME)/start.elf + $(BOOTHOME)/bootcode.bin \ + $(BOOTHOME)/COPYING.linux \ + $(BOOTHOME)/fixup4.dat \ + $(BOOTHOME)/fixup.dat \ + $(BOOTHOME)/LICENCE.broadcom \ + $(BOOTHOME)/start4.elf \ + $(BOOTHOME)/start.elf MT32EMUHOME=$(realpath external/munt/mt32emu) MT32EMUBUILDDIR=build-munt diff --git a/Kernel.mk b/Kernel.mk index 2e09d0b..d065210 100644 --- a/Kernel.mk +++ b/Kernel.mk @@ -5,40 +5,40 @@ include Config.mk OBJS := src/config.o \ - src/control/control.o \ - src/control/mister.o \ - src/control/rotaryencoder.o \ - src/control/simplebuttons.o \ - src/control/simpleencoder.o \ - src/kernel.o \ - src/lcd/drivers/hd44780.o \ - src/lcd/drivers/hd44780fourbit.o \ - src/lcd/drivers/hd44780i2c.o \ - src/lcd/drivers/sh1106.o \ - src/lcd/drivers/ssd1306.o \ - src/lcd/ui.o \ - src/main.o \ - src/midimonitor.o \ - src/midiparser.o \ - src/mt32pi.o \ - src/net/applemidi.o \ - src/net/ftpdaemon.o \ - src/net/ftpworker.o \ - src/net/udpmidi.o \ - src/pisound.o \ - src/power.o \ - src/rommanager.o \ - src/soundfontmanager.o \ - src/synth/mt32synth.o \ - src/synth/soundfontsynth.o \ - src/zoneallocator.o + src/control/control.o \ + src/control/mister.o \ + src/control/rotaryencoder.o \ + src/control/simplebuttons.o \ + src/control/simpleencoder.o \ + src/kernel.o \ + src/lcd/drivers/hd44780.o \ + src/lcd/drivers/hd44780fourbit.o \ + src/lcd/drivers/hd44780i2c.o \ + src/lcd/drivers/sh1106.o \ + src/lcd/drivers/ssd1306.o \ + src/lcd/ui.o \ + src/main.o \ + src/midimonitor.o \ + src/midiparser.o \ + src/mt32pi.o \ + src/net/applemidi.o \ + src/net/ftpdaemon.o \ + src/net/ftpworker.o \ + src/net/udpmidi.o \ + src/pisound.o \ + src/power.o \ + src/rommanager.o \ + src/soundfontmanager.o \ + src/synth/mt32synth.o \ + src/synth/soundfontsynth.o \ + src/zoneallocator.o EXTRACLEAN += src/*.d src/*.o \ - src/control/*.d src/control/*.o \ - src/lcd/*.d src/lcd/*.o \ - src/lcd/drivers/*.d src/lcd/drivers/*.o \ - src/net/*.d src/net/*.o \ - src/synth/*.d src/synth/*.o + src/control/*.d src/control/*.o \ + src/lcd/*.d src/lcd/*.o \ + src/lcd/drivers/*.d src/lcd/drivers/*.o \ + src/net/*.d src/net/*.o \ + src/synth/*.d src/synth/*.o # # inih @@ -46,30 +46,30 @@ EXTRACLEAN += src/*.d src/*.o \ OBJS += $(INIHHOME)/ini.o INCLUDE += -I $(INIHHOME) EXTRACLEAN += $(INIHHOME)/ini.d \ - $(INIHHOME)/ini.o + $(INIHHOME)/ini.o include $(CIRCLEHOME)/Rules.mk CFLAGS += -Werror -Wextra -Wno-unused-parameter CFLAGS += -I "$(NEWLIBDIR)/include" \ - -I $(STDDEF_INCPATH) \ - -I $(CIRCLESTDLIBHOME)/include \ - -I include \ - -I . + -I $(STDDEF_INCPATH) \ + -I $(CIRCLESTDLIBHOME)/include \ + -I include \ + -I . LIBS := $(CIRCLE_STDLIB_LIBS) \ - $(CIRCLEHOME)/addon/fatfs/libfatfs.a \ - $(CIRCLEHOME)/addon/SDCard/libsdcard.a \ - $(CIRCLEHOME)/addon/wlan/hostap/wpa_supplicant/libwpa_supplicant.a \ - $(CIRCLEHOME)/addon/wlan/libwlan.a \ - $(CIRCLEHOME)/lib/fs/libfs.a \ - $(CIRCLEHOME)/lib/input/libinput.a \ - $(CIRCLEHOME)/lib/libcircle.a \ - $(CIRCLEHOME)/lib/net/libnet.a \ - $(CIRCLEHOME)/lib/sched/libsched.a \ - $(CIRCLEHOME)/lib/sound/libsound.a \ - $(CIRCLEHOME)/lib/usb/libusb.a + $(CIRCLEHOME)/addon/fatfs/libfatfs.a \ + $(CIRCLEHOME)/addon/SDCard/libsdcard.a \ + $(CIRCLEHOME)/addon/wlan/hostap/wpa_supplicant/libwpa_supplicant.a \ + $(CIRCLEHOME)/addon/wlan/libwlan.a \ + $(CIRCLEHOME)/lib/fs/libfs.a \ + $(CIRCLEHOME)/lib/input/libinput.a \ + $(CIRCLEHOME)/lib/libcircle.a \ + $(CIRCLEHOME)/lib/net/libnet.a \ + $(CIRCLEHOME)/lib/sched/libsched.a \ + $(CIRCLEHOME)/lib/sound/libsound.a \ + $(CIRCLEHOME)/lib/usb/libusb.a ifeq ($(HDMI_CONSOLE), 1) DEFINE += -D HDMI_CONSOLE @@ -81,7 +81,7 @@ INCLUDE += -I $(MT32EMUBUILDDIR)/include EXTRALIBS += $(MT32EMULIB) INCLUDE += -I $(FLUIDSYNTHBUILDDIR)/include \ - -I $(FLUIDSYNTHHOME)/include + -I $(FLUIDSYNTHHOME)/include EXTRALIBS += $(FLUIDSYNTHLIB) # diff --git a/Makefile b/Makefile index 05de6e7..6fe5656 100644 --- a/Makefile +++ b/Makefile @@ -79,14 +79,14 @@ mt32emu: $(MT32EMUBUILDDIR)/.done $(MT32EMUBUILDDIR)/.done: $(CIRCLESTDLIBHOME)/.done @CFLAGS="$(CFLAGS_EXTERNAL)" \ CXXFLAGS="$(CFLAGS_EXTERNAL)" \ - cmake -B $(MT32EMUBUILDDIR) \ - $(CMAKE_TOOLCHAIN_FLAGS) \ - -DCMAKE_CXX_FLAGS_RELEASE="-Ofast" \ - -DCMAKE_BUILD_TYPE=Release \ - -Dlibmt32emu_C_INTERFACE=FALSE \ - -Dlibmt32emu_SHARED=FALSE \ - $(MT32EMUHOME) \ - >/dev/null + cmake -B $(MT32EMUBUILDDIR) \ + $(CMAKE_TOOLCHAIN_FLAGS) \ + -DCMAKE_CXX_FLAGS_RELEASE="-Ofast" \ + -DCMAKE_BUILD_TYPE=Release \ + -Dlibmt32emu_C_INTERFACE=FALSE \ + -Dlibmt32emu_SHARED=FALSE \ + $(MT32EMUHOME) \ + >/dev/null @cmake --build $(MT32EMUBUILDDIR) @touch $@ @@ -99,35 +99,35 @@ $(FLUIDSYNTHBUILDDIR)/.done: $(CIRCLESTDLIBHOME)/.done @${APPLY_PATCH} $(FLUIDSYNTHHOME) patches/fluidsynth-2.3.1-circle.patch @CFLAGS="$(CFLAGS_EXTERNAL)" \ - cmake -B $(FLUIDSYNTHBUILDDIR) \ - $(CMAKE_TOOLCHAIN_FLAGS) \ - -DCMAKE_C_FLAGS_RELEASE="-Ofast -fopenmp-simd" \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=OFF \ - -Denable-aufile=OFF \ - -Denable-dbus=OFF \ - -Denable-dsound=OFF \ - -Denable-floats=ON \ - -Denable-ipv6=OFF \ - -Denable-jack=OFF \ - -Denable-ladspa=OFF \ - -Denable-libinstpatch=OFF \ - -Denable-libsndfile=OFF \ - -Denable-midishare=OFF \ - -Denable-network=OFF \ - -Denable-oboe=OFF \ - -Denable-openmp=OFF \ - -Denable-opensles=OFF \ - -Denable-oss=OFF \ - -Denable-pipewire=OFF \ - -Denable-pulseaudio=OFF \ - -Denable-readline=OFF \ - -Denable-sdl2=OFF \ - -Denable-threads=OFF \ - -Denable-waveout=OFF \ - -Denable-winmidi=OFF \ - $(FLUIDSYNTHHOME) \ - >/dev/null + cmake -B $(FLUIDSYNTHBUILDDIR) \ + $(CMAKE_TOOLCHAIN_FLAGS) \ + -DCMAKE_C_FLAGS_RELEASE="-Ofast -fopenmp-simd" \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=OFF \ + -Denable-aufile=OFF \ + -Denable-dbus=OFF \ + -Denable-dsound=OFF \ + -Denable-floats=ON \ + -Denable-ipv6=OFF \ + -Denable-jack=OFF \ + -Denable-ladspa=OFF \ + -Denable-libinstpatch=OFF \ + -Denable-libsndfile=OFF \ + -Denable-midishare=OFF \ + -Denable-network=OFF \ + -Denable-oboe=OFF \ + -Denable-openmp=OFF \ + -Denable-opensles=OFF \ + -Denable-oss=OFF \ + -Denable-pipewire=OFF \ + -Denable-pulseaudio=OFF \ + -Denable-readline=OFF \ + -Denable-sdl2=OFF \ + -Denable-threads=OFF \ + -Denable-waveout=OFF \ + -Denable-winmidi=OFF \ + $(FLUIDSYNTHHOME) \ + >/dev/null @cmake --build $(FLUIDSYNTHBUILDDIR) --target libfluidsynth @touch $@