Update buildtools.

This commit is contained in:
Steveice10 2017-01-07 12:18:38 -08:00
parent 3e41723d05
commit 670eed74b4
3 changed files with 9 additions and 22 deletions

View File

@ -3,14 +3,10 @@
TARGET := NATIVE
LIBRARY := 0
ifeq ($(TARGET),3DS)
ifeq ($(TARGET),$(filter $(TARGET),3DS WIIU))
ifeq ($(strip $(DEVKITPRO)),)
$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro")
endif
ifeq ($(strip $(DEVKITARM)),)
$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
endif
endif
# COMMON CONFIGURATION #
@ -28,25 +24,15 @@ LIBRARY_DIRS :=
LIBRARIES :=
BUILD_FLAGS := -Wno-unused-result -Wno-sign-compare -Wno-misleading-indentation -Wno-unused-function
BUILD_FLAGS_CC :=
BUILD_FLAGS_CXX :=
RUN_FLAGS :=
# 3DS CONFIGURATION #
VERSION_PARTS := $(subst ., ,$(shell git describe --tags --abbrev=0))
TITLE := $(NAME)
DESCRIPTION :=
AUTHOR :=
PRODUCT_CODE :=
UNIQUE_ID :=
SYSTEM_MODE :=
SYSTEM_MODE_EXT :=
ICON_FLAGS :=
ROMFS_DIR :=
BANNER_AUDIO :=
BANNER_IMAGE :=
ICON :=
VERSION_MAJOR := $(word 1, $(VERSION_PARTS))
VERSION_MINOR := $(word 2, $(VERSION_PARTS))
VERSION_MICRO := $(word 3, $(VERSION_PARTS))
# INTERNAL #

@ -1 +1 @@
Subproject commit 2ef982ddbd9ae2d78052a42a2144fbc408bb30ea
Subproject commit 29ab2234e7376807d154a2a06b5d3d49ad50f631

View File

@ -390,6 +390,7 @@ void cmd_print_commands() {
}
void cmd_print_usage(const std::string& executedFrom) {
printf("bannertool v%d.%d.%d\n", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
printf("Usage: %s <command> <args>\n", executedFrom.c_str());
cmd_print_commands();
}