From 670eed74b4ac0841db15c098f62ec732add3d804 Mon Sep 17 00:00:00 2001
From: Steveice10 <1269164+Steveice10@users.noreply.github.com>
Date: Sat, 7 Jan 2017 12:18:38 -0800
Subject: [PATCH] Update buildtools.

---
 Makefile       | 28 +++++++---------------------
 buildtools     |  2 +-
 source/cmd.cpp |  1 +
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index c268f75..edd0a71 100644
--- a/Makefile
+++ b/Makefile
@@ -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 #
 
diff --git a/buildtools b/buildtools
index 2ef982d..29ab223 160000
--- a/buildtools
+++ b/buildtools
@@ -1 +1 @@
-Subproject commit 2ef982ddbd9ae2d78052a42a2144fbc408bb30ea
+Subproject commit 29ab2234e7376807d154a2a06b5d3d49ad50f631
diff --git a/source/cmd.cpp b/source/cmd.cpp
index 6b1fdf5..05e07e6 100644
--- a/source/cmd.cpp
+++ b/source/cmd.cpp
@@ -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();
 }