From 6c4f0be0a5b3c07a95bd33dad89b8120ddbb3fa2 Mon Sep 17 00:00:00 2001
From: orbea <orbea@fredslev.dk>
Date: Thu, 20 Dec 2018 22:08:29 -0800
Subject: [PATCH] Remove some hardcoded version strings.

---
 Makefile.classic_armv7_a7 | 9 ++++++---
 Makefile.libnx            | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile.classic_armv7_a7 b/Makefile.classic_armv7_a7
index 34dc715cb5..ce76bb4242 100644
--- a/Makefile.classic_armv7_a7
+++ b/Makefile.classic_armv7_a7
@@ -11,10 +11,13 @@
 # patchelf
 # bc
 
+include version.all
+
 # Classic Readme Variables ############
-CLASSIC_MODS_VER := Official_Retroarch_v1_7_5c_COptimised
-CLASSIC_MODS_NAME := RetroArch v1.7.5c (Official Classic Optimised)
-CLASSIC_VERSION := 1.7.5c \(Classic+\)
+CLASSIC_ALT_VER := $(shell echo $(RARCH_VERSION) | tr . _)
+CLASSIC_MODS_VER := Official_Retroarch_v$(CLASSIC_ALT_VER)c_COptimised
+CLASSIC_MODS_NAME := RetroArch v$(RARCH_VERSION)c \(Official Classic Optimised\)
+CLASSIC_VERSION := $(RARCH_VERSION)c \(Classic+\)
 MOD_CREATOR := Libretro + ModMyClassic
 MOD_CATEGORY := RetroArch
 GIT_COMMIT := $(shell echo "`git rev-parse --short HEAD``git diff-index --quiet HEAD -- || echo '-dirty'`")
diff --git a/Makefile.libnx b/Makefile.libnx
index b9f482b563..7a087bdfa5 100644
--- a/Makefile.libnx
+++ b/Makefile.libnx
@@ -1,3 +1,5 @@
+include version.all
+
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
@@ -104,7 +106,7 @@ EXEFS_SRC := exefs_src
 #ROMFS := switch/romfs
 
 APP_TITLE := RetroArch
-APP_VERSION := 1.7.5
+APP_VERSION := $(RARCH_VERSION)
 APP_AUTHOR := libretro Team
 APP_ICON := pkg/libnx/retroarch.jpg