From 4061f814196cb9ff64cc64978bea4874769fa647 Mon Sep 17 00:00:00 2001
From: Steven Smith <Steveice10@gmail.com>
Date: Mon, 11 Jul 2016 12:35:37 -0700
Subject: [PATCH] Move versions out of 3DS target.

---
 make_base | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/make_base b/make_base
index 253d0c6..f2d6ade 100644
--- a/make_base
+++ b/make_base
@@ -57,8 +57,12 @@ OBJECT_FILES := $(filter-out $(BUILT_FILTER),$(OBJECT_FILES))
 
 OUTPUT_ZIP_FILE ?= $(OUTPUT_DIR)/$(STRIPPED_NAME).zip
 
+VERSION_MAJOR ?= 0
+VERSION_MINOR ?= 0
+VERSION_MICRO ?= 0
+
 LD_FLAGS := $(patsubst %,-L%/lib,$(LIBRARY_DIRS)) $(patsubst %,-l%,$(LIBRARIES))
-COMMON_CC_FLAGS := $(sort $(foreach dir,$(SOURCE_DIRS),$(patsubst %,-I$(BUILD_DIR)/%,$(dir $(call rwildcard,$(dir),*))))) $(patsubst %,-I%,$(INCLUDE_DIRS)) $(patsubst %,-I%/include,$(LIBRARY_DIRS)) -g -Wall $(BUILD_FLAGS)
+COMMON_CC_FLAGS := $(sort $(foreach dir,$(SOURCE_DIRS),$(patsubst %,-I$(BUILD_DIR)/%,$(dir $(call rwildcard,$(dir),*))))) $(patsubst %,-I%,$(INCLUDE_DIRS)) $(patsubst %,-I%/include,$(LIBRARY_DIRS)) -g -Wall -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_MICRO=$(VERSION_MICRO) $(BUILD_FLAGS)
 
 ifeq ($(findstring -O,$(BUILD_FLAGS)),)
 	COMMON_CC_FLAGS += -O2
@@ -87,9 +91,6 @@ ifeq ($(TARGET),3DS)
     REMOTE_IP ?= 127.0.0.1 # User-defined
 
     TITLE ?= $(NAME)
-    VERSION_MAJOR ?= 0
-    VERSION_MINOR ?= 0
-    VERSION_MICRO ?= 0
 
     CATEGORY ?= Application
     USE_ON_SD ?= true
@@ -144,7 +145,7 @@ ifeq ($(TARGET),3DS)
     endif
 
     LD_FLAGS += -specs=3dsx.specs
-    COMMON_CC_FLAGS += -mword-relocations -fomit-frame-pointer -ffast-math -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft -DARM11 -D_3DS -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_MICRO=$(VERSION_MICRO)
+    COMMON_CC_FLAGS += -mword-relocations -fomit-frame-pointer -ffast-math -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft -DARM11 -D_3DS
 
     _3DSXTOOL_FLAGS :=
     COMMON_MAKEROM_FLAGS := -rsf $(BUILDTOOLS_DIR)/3ds/template.rsf -target t -exefslogo -icon $(BUILD_DIR)/icon.icn -banner $(BUILD_DIR)/banner.bnr -major $(VERSION_MAJOR) -minor $(VERSION_MINOR) -micro $(VERSION_MICRO) -DAPP_TITLE="$(TITLE)" -DAPP_PRODUCT_CODE="$(PRODUCT_CODE)" -DAPP_UNIQUE_ID="$(UNIQUE_ID)" -DAPP_SYSTEM_MODE="$(SYSTEM_MODE)" -DAPP_SYSTEM_MODE_EXT="$(SYSTEM_MODE_EXT)" -DAPP_CATEGORY="$(CATEGORY)" -DAPP_USE_ON_SD="$(USE_ON_SD)" -DAPP_MEMORY_TYPE="$(MEMORY_TYPE)" -DAPP_CPU_SPEED="$(CPU_SPEED)" -DAPP_ENABLE_L2_CACHE="$(ENABLE_L2_CACHE)"