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

Moved 'v' from APP_VERSION in Makefile to Makefile.nx/Makefile.pc, so that the version in the built nro-nacp doesn't include 'v'. Removed nxlink.h include since switch.h has this.

Browse Source
This commit is contained in:
yellows8 2018-03-19 18:36:58 -04:00
parent ebced71ec3
commit 5731858272
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
export APP_VERSION := v2.0.0
export APP_VERSION := 2.0.0
.PHONY: clean all nx pc dist-bin

4
Makefile.nx
View File

@ -36,7 +36,7 @@ DATA := data
INCLUDES := include
EXEFS_SRC := exefs_src
DIST_PATH := $(TARGET)_$(APP_VERSION)
DIST_PATH := $(TARGET)_v$(APP_VERSION)
#---------------------------------------------------------------------------------
# options for code generation
@ -46,7 +46,7 @@ ARCH := -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE
CFLAGS := -g -Wall -O2 -ffunction-sections \
$(ARCH) $(DEFINES)
CFLAGS += $(INCLUDE) -D__SWITCH__ -DVERSION=\"$(APP_VERSION)\"
CFLAGS += $(INCLUDE) -D__SWITCH__ -DVERSION=\"v$(APP_VERSION)\"
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11

2
Makefile.pc
View File

@ -27,7 +27,7 @@ test : pc_main/main.cpp pc_main/pc_launch.c \
build_pc/interuiregular14.o build_pc/interuiregular18.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
gcc -Wall -O2 -g -DVERSION=\"$(APP_VERSION)\" $(EXTRA_CFLAGS) $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ -lm -lz $(EXTRA_LDFLAGS) -I. -I$(DEVKITPRO)/libnx/include -Ibuild_pc -g -o $@
gcc -Wall -O2 -g -DVERSION=\"v$(APP_VERSION)\" $(EXTRA_CFLAGS) $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ -lm -lz $(EXTRA_LDFLAGS) -I. -I$(DEVKITPRO)/libnx/include -Ibuild_pc -g -o $@
build_pc/tahoma12.o : data/tahoma12.nxfnt
mkdir -p $(dir $@)

2
common/netloader.c
View File

@ -30,8 +30,6 @@ typedef uint32_t in_addr_t;
#include "common.h"
#include "netloader.h"
#include <switch/runtime/nxlink.h>
// having trouble with non blocking sockets & udp on switch currently
#ifndef __SWITCH__
#define PING_ENABLED 1