Merge pull request #23 from TraceEntertains/main

Nimbus 1.5.0

Author: jonbarrow

README.md

@@ -23,9 +23,11 @@
 Thanks to:
 
 - [pinklimes](https://github.com/gitlimes) for the CIA version banner
-- [TraceEntertains](https://github.com/TraceEntertains) for making a CIA version of Nimbus and a few other things
+- [TraceEntertains](https://github.com/TraceEntertains) for making a CIA version of Nimbus and maintaining the project
 - [SciresM](https://github.com/SciresM) for making the 3DS SSL patches
 - [zaksabeast](https://github.com/zaksabeast) for the original 3ds-Friend-Account-Manager and all the research into the friends and act system titles
 - [shutterbug2000](https://github.com/shutterbug2000) for the GUI
-- [libctru](https://github.com/devkitPro/libctru) for the `frda.c` base, homebrew template, and all of the library functions
+- [libctru](https://github.com/devkitPro/libctru) for the `frda.c` base, homebrew template, and other library functions (and thanks to citro2d for part of a system font function)
+- [Universal-Core](https://github.com/Universal-Team/Universal-Core) for the string drawing functions
+- [Fangal-Airbag](https://github.com/Fangal-Airbag) for making the account switcher GUI support button controls
 - All other 3DS researchers

app/Makefile

@@ -49,9 +49,11 @@ ICON      := meta/icon.png
 BNR_IMAGE := meta/banner.png
 BNR_AUDIO := meta/audio.wav
 
+VERSION_HEADER = version.hpp
+
 VERSION_MAJOR := 1
-VERSION_MINOR := 0
-VERSION_MICRO := 2
+VERSION_MINOR := 5
+VERSION_MICRO := 0
 
 #GFXBUILD	:=	$(ROMFS)/gfx
 
@@ -67,7 +69,7 @@ CFLAGS	    :=	-g -Wall $(OPTIMIZE) -mword-relocations \
 
 CFLAGS	    +=	$(INCLUDE) -D__3DS__
 
-CXXFLAGS	:=  $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
+CXXFLAGS	:=  $(CFLAGS) -fno-rtti -fno-exceptions -std=c++20
 
 ASFLAGS	    :=	-g $(ARCH)
 LDFLAGS	     =	-specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) $(OPTIMIZE)
@@ -221,14 +223,14 @@ else
 #---------------------------------------------------------------------------------
 # main targets
 #---------------------------------------------------------------------------------
-all: 3dsx cia
+all: $(VERSION_HEADER) $(OUTPUT).3dsx $(OUTPUT).cia
 
-3dsx: $(OUTPUT).3dsx
+3dsx: $(VERSION_HEADER) $(OUTPUT).3dsx
 
-cia: $(OUTPUT).cia
+cia: $(VERSION_HEADER) $(OUTPUT).cia
 
 ifeq ($(strip $(NO_SMDH)),)
-.PHONY: all
+.PHONY: $(VERSION_HEADER) all
 all:            $(OUTPUT).3dsx $(OUTPUT).smdh
 $(OUTPUT).smdh: $(TOPDIR)/Makefile $(TOPDIR)/Makefile
 $(OUTPUT).3dsx: $(OUTPUT).smdh
@@ -238,7 +240,20 @@ $(OUTPUT).3dsx: $(OUTPUT).elf $(_3DSXDEPS)
 
 $(OFILES_SOURCES): $(HFILES)
 
-$(OUTPUT).elf:  $(OFILES)
+$(OUTPUT).elf: $(OFILES)
+
+$(VERSION_HEADER):
+	@echo generating version header...
+	@mkdir -p $(BUILD)  # Create the build directory if it doesn't exist
+	@echo "// Compile time constants" > $@.new
+	@echo "" >> $@.new
+	@echo "#define APP_TITLE \"$(APP_TITLE)\"" >> $@.new
+	@echo "" >> $@.new
+	@echo "#define VERSION_MAJOR $(VERSION_MAJOR)" >> $@.new
+	@echo "#define VERSION_MINOR $(VERSION_MINOR)" >> $@.new
+	@echo "#define VERSION_MICRO $(VERSION_MICRO)" >> $@.new
+	@if ! cmp -s $@ $@.new; then mv $@.new $@; else rm $@.new; fi
+	
 #---------------------------------------------------------------------------------
 # you need a rule like this for each extension you use as binary data
 #---------------------------------------------------------------------------------