Program version is now in a const from a generated file, not a static macro. Plus all the mess I had to make to get that to work.

src/CommandLineActions.cpp

@@ -17,10 +17,7 @@
 #include "Preference.h"
 #include "JsonUtil.h"
 #include "ScreenInstallOverlay.h"
-
-#if defined(HAVE_VERSION_INFO)
 #include "ver.h"
-#endif
 
 // only used for Version()
 #if defined(_WINDOWS)
@@ -73,7 +70,7 @@ static void LuaInformation()
 	pNode->AppendAttr("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
 	pNode->AppendAttr("xsi:schemaLocation", "http://www.stepmania.com Lua.xsd");
 
-	pNode->AppendChild("Version", PRODUCT_ID_VER);
+	pNode->AppendChild("Version", string(PRODUCT_FAMILY) + product_version);
 	pNode->AppendChild("Date", DateTime::GetNowDate().GetString());
 
 	XmlFileUtil::SaveToFile(pNode, "Lua.xml", "Lua.xsl");
@@ -90,7 +87,7 @@ static void LuaInformation()
 static void Version()
 {
 	#if defined(WIN32)
-		RString sProductID = ssprintf("%s", PRODUCT_ID_VER);
+		RString sProductID = ssprintf("%s", (string(PRODUCT_FAMILY) + product_version).c_str() );
 		RString sVersion = "(StepMania was built without HAVE_VERSION_INFO)";
 		#if defined(HAVE_VERSION_INFO)
 			sVersion = ssprintf("build %lu\nCompile Date: %s @ %s", version_num, version_date, version_time);