From 43da85325e447ae824d79a604d30116674a0566f Mon Sep 17 00:00:00 2001
From: RichardG867 <richardg867@gmail.com>
Date: Mon, 8 Nov 2021 18:22:04 -0300
Subject: [PATCH] Fixes for static and CMake version includes

---
 src/include/86box/version.h.in   |  2 +-
 src/include_make/86box/version.h | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/include/86box/version.h.in b/src/include/86box/version.h.in
index ec7a4fdb7..f0a92a008 100644
--- a/src/include/86box/version.h.in
+++ b/src/include/86box/version.h.in
@@ -22,7 +22,7 @@
 
 #define EMU_VERSION	"@CMAKE_PROJECT_VERSION@"
 #define EMU_VERSION_W	LSTR(EMU_VERSION)
-#define EMU_VERSION_EX	"@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@@CMAKE_PROJECT_VERSION_PATCH@"
+#define EMU_VERSION_EX	"@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@0"
 #define EMU_VERSION_MAJ	@CMAKE_PROJECT_VERSION_MAJOR@
 #define EMU_VERSION_MIN	@CMAKE_PROJECT_VERSION_MINOR@
 
diff --git a/src/include_make/86box/version.h b/src/include_make/86box/version.h
index b3da62c6e..6574d0049 100644
--- a/src/include_make/86box/version.h
+++ b/src/include_make/86box/version.h
@@ -13,19 +13,25 @@
  *		Copyright 2020 Miran Grca.
  */
 
+#define _LSTR(s) L ## s
+#define LSTR(s) _LSTR(s)
+
 /* Version info. */
 #define EMU_NAME	"86Box"
-#define EMU_NAME_W	L"86Box"
+#define EMU_NAME_W	LSTR(EMU_NAME)
 
 #define EMU_VERSION	"3.0"
-#define EMU_VERSION_W	L"3.0"
+#define EMU_VERSION_W	LSTR(EMU_VERSION)
 #define EMU_VERSION_EX	"3.00"
 #define EMU_VERSION_MAJ	3
 #define EMU_VERSION_MIN	0
 
-#define COPYRIGHT_YEAR	"2020"
+#define EMU_VERSION_FULL	EMU_VERSION
+#define EMU_VERSION_FULL_W	EMU_VERSION_W
+
+#define COPYRIGHT_YEAR	"2021"
 
 /* Web URL info. */
 #define EMU_SITE	L"86box.net"
 #define EMU_ROMS_URL	L"https://github.com/86Box/roms/releases/latest"
-#define EMU_DOCS_URL	L"https://86box.readthedocs.io"
\ No newline at end of file
+#define EMU_DOCS_URL	L"https://86box.readthedocs.io"