1 files changed, 9 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/version.h b/rbutil/rbutilqt/version.h
index a4a007867e..ac3728c630 100644
--- a/rbutil/rbutilqt/version.h
+++ b/rbutil/rbutilqt/version.h
@@ -26,7 +26,15 @@
 // rebuilds because of issues like dependency problems or library updates).
 // Usually empty.
 #define BUILDID ""
-#define VERSION "1.2.14" BUILDID
+// Version string is constructed from parts, since the Windows rc file needs it
+// combined differently.
+#define VERSION_MAJOR 1
+#define VERSION_MINOR 2
+#define VERSION_MICRO 14
+#define VERSION_PATCH 0
+#define STR(x) #x
+#define VERSIONSTRING(a, b, c) STR(a) "." STR(b) "." STR(c)
+#define VERSION VERSIONSTRING(VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO) BUILDID
 // PUREVERSION should identify the build uniquely. Use version string for now.
 #define PUREVERSION "$Rev$"

diff --git a/rbutil/rbutilqt/version.h b/rbutil/rbutilqt/version.h index a4a007867e..ac3728c630 100644 --- a/rbutil/rbutilqt/version.h +++ b/rbutil/rbutilqt/version.h
@@ -26,7 +26,15 @@
26	// rebuilds because of issues like dependency problems or library updates).	26	// rebuilds because of issues like dependency problems or library updates).
27	// Usually empty.	27	// Usually empty.
28	#define BUILDID ""	28	#define BUILDID ""
29	#define VERSION "1.2.14" BUILDID	29	// Version string is constructed from parts, since the Windows rc file needs it
		30	// combined differently.
		31	#define VERSION_MAJOR 1
		32	#define VERSION_MINOR 2
		33	#define VERSION_MICRO 14
		34	#define VERSION_PATCH 0
		35	#define STR(x) #x
		36	#define VERSIONSTRING(a, b, c) STR(a) "." STR(b) "." STR(c)
		37	#define VERSION VERSIONSTRING(VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO) BUILDID
30	// PUREVERSION should identify the build uniquely. Use version string for now.	38	// PUREVERSION should identify the build uniquely. Use version string for now.
31	#define PUREVERSION "$Rev$"	39	#define PUREVERSION "$Rev$"
32		40