diff --git a/Makefile b/Makefile index ec0215f..52d4f07 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -export APP_VERSION := v2.0.0 +export APP_VERSION := 2.0.0 .PHONY: clean all nx pc dist-bin diff --git a/Makefile.nx b/Makefile.nx index 6f3da32..48b79ca 100644 --- a/Makefile.nx +++ b/Makefile.nx @@ -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 diff --git a/Makefile.pc b/Makefile.pc index 5709374..4cd7537 100644 --- a/Makefile.pc +++ b/Makefile.pc @@ -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 $@) diff --git a/common/netloader.c b/common/netloader.c index 5962d7c..f536e57 100644 --- a/common/netloader.c +++ b/common/netloader.c @@ -30,8 +30,6 @@ typedef uint32_t in_addr_t; #include "common.h" #include "netloader.h" -#include - // having trouble with non blocking sockets & udp on switch currently #ifndef __SWITCH__ #define PING_ENABLED 1