mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved hbmenu version string into Makefile. Updated Makefiles. Fixed Makefile issues.

Browse Source
This commit is contained in:
yellows8 2018-02-26 19:43:11 -05:00
parent 4211679e0e
commit 922319b0f3
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -1,11 +1,15 @@
export APP_VERSION := v2.0.0
.PHONY: clean all nx pc
all: nx pc
nx: nx:
$(MAKE) -f Makefile.nx $(MAKE) -f Makefile.nx
pc: pc:
$(MAKE) -f Makefile.pc $(MAKE) -f Makefile.pc
all: nx pc
clean: clean:
$(MAKE) -f Makefile.pc clean $(MAKE) -f Makefile.pc clean
$(MAKE) -f Makefile.nx clean $(MAKE) -f Makefile.nx clean

2
Makefile.nx
View File

@ -44,7 +44,7 @@ ARCH := -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE
CFLAGS := -g -Wall -O2 -ffunction-sections \ CFLAGS := -g -Wall -O2 -ffunction-sections \
$(ARCH) $(DEFINES) $(ARCH) $(DEFINES)
CFLAGS += $(INCLUDE) -DSWITCH CFLAGS += $(INCLUDE) -DSWITCH -DVERSION=\"$(APP_VERSION)\"
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11

2
Makefile.pc
View File

@ -15,7 +15,7 @@ test : pc_main/main.cpp pc_main/pc_launch.c \
build_pc/interuiregular14.o build_pc/interuiregular18.o \ build_pc/interuiregular14.o build_pc/interuiregular18.o \
build_pc/invalid_icon.bin.o build_pc/folder_icon.bin.o \ build_pc/invalid_icon.bin.o build_pc/folder_icon.bin.o \
build_pc/button_a_light.bin.o build_pc/button_a_dark.bin.o build_pc/button_b_light.bin.o build_pc/button_b_dark.bin.o build_pc/hbmenu_logo_light.bin.o build_pc/hbmenu_logo_dark.bin.o build_pc/button_a_light.bin.o build_pc/button_a_dark.bin.o build_pc/button_b_light.bin.o build_pc/button_b_dark.bin.o build_pc/hbmenu_logo_light.bin.o build_pc/hbmenu_logo_dark.bin.o
gcc -Wall -O2 -g0 $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ -lm -I. -Ibuild_pc -o $@ gcc -Wall -O2 -g0 -DVERSION=\"$(APP_VERSION)\" $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ -lm -I. -Ibuild_pc -o $@
build_pc/tahoma12.o : data/tahoma12.nxfnt build_pc/tahoma12.o : data/tahoma12.nxfnt
mkdir -p $(dir $@) mkdir -p $(dir $@)

2
README.md
View File

@ -5,7 +5,7 @@ See [Switchbrew](http://switchbrew.org/index.php?title=Homebrew_Applications) fo
The latest release is available from the [releases](https://github.com/switchbrew/nx-hbmenu/releases/latest) page. The latest release is available from the [releases](https://github.com/switchbrew/nx-hbmenu/releases/latest) page.
#### Building #### Building
Build with Makefile.nx directly or just run ```make```. Build with ```make nx``` or just run ```make```.
#### Credits #### Credits

2
common/menu.c
View File

@ -337,7 +337,7 @@ void menuLoop() {
timer += 0.05; timer += 0.05;
drawImage(40, 20, 140, 60, themeCurrent.hbmenuLogoImage, IMAGE_MODE_RGBA32); drawImage(40, 20, 140, 60, themeCurrent.hbmenuLogoImage, IMAGE_MODE_RGBA32);
DrawText(interuiregular14, 180, 46, themeCurrent.textColor, "v2.0.0"); DrawText(interuiregular14, 180, 46, themeCurrent.textColor, VERSION);
DrawTextTruncate(interuiregular18, 40, 720 - 47, themeCurrent.textColor, menu->dirname, 918, "..."); DrawTextTruncate(interuiregular18, 40, 720 - 47, themeCurrent.textColor, menu->dirname, 918, "...");
#ifdef PERF_LOG_DRAW//Seperate from the PERF_LOG define since this might affect perf. #ifdef PERF_LOG_DRAW//Seperate from the PERF_LOG define since this might affect perf.