From 0a5d07eef2dfe8263a4b37d332083cbdd2d1b50d Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Sat, 13 Nov 2010 20:16:04 +0000 Subject: [PATCH] Small change to how PRODUCTVERSION is determined (thanks spx!). --- Application/Application.rc | 6 +++++- Library/Library.rc | 6 +++++- Plugins/PluginAdvancedCPU/PluginAdvancedCPU.rc | 6 +++++- Plugins/PluginExample/PluginExample.rc | 6 +++++- Plugins/PluginMediaKey/PluginMediaKey.rc | 6 +++++- Plugins/PluginPerfMon/PluginPerfMon.rc | 6 +++++- Plugins/PluginPing/PluginPing.rc | 6 +++++- Plugins/PluginPower/PluginPower.rc | 6 +++++- Plugins/PluginQuote/PluginQuote.rc | 6 +++++- Plugins/PluginRecycleManager/PluginRecycleManager.rc | 6 +++++- Plugins/PluginResMon/PluginResMon.rc | 6 +++++- Plugins/PluginSpeedFan/PluginSpeedFan.rc | 6 +++++- Plugins/PluginSysInfo/PluginSysInfo.rc | 6 +++++- Plugins/PluginVirtualDesktops/PluginVirtualDesktops.rc | 6 +++++- Plugins/PluginWebParser/PluginWebParser.rc | 6 +++++- Plugins/PluginWifiStatus/PluginWifiStatus.rc | 6 +++++- Plugins/PluginWin7Audio/PluginWin7Audio.rc | 6 +++++- Plugins/PluginWindowMessage/PluginWindowMessage.rc | 6 +++++- Plugins/PluginiTunes/PluginiTunes.rc | 6 +++++- revision-number.h | 10 +++++----- 20 files changed, 100 insertions(+), 24 deletions(-) diff --git a/Application/Application.rc b/Application/Application.rc index 20149d19..182520ca 100644 --- a/Application/Application.rc +++ b/Application/Application.rc @@ -51,7 +51,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "OriginalFilename", "Rainmeter.exe" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Library/Library.rc b/Library/Library.rc index 125a58c0..cda3bab4 100644 --- a/Library/Library.rc +++ b/Library/Library.rc @@ -50,7 +50,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "OriginalFilename", "Rainmeter.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.rc b/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.rc index 09159921..87f404c6 100644 --- a/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.rc +++ b/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "OriginalFilename", "AdvancedCPU.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginExample/PluginExample.rc b/Plugins/PluginExample/PluginExample.rc index 86ac1a7c..b57093ee 100644 --- a/Plugins/PluginExample/PluginExample.rc +++ b/Plugins/PluginExample/PluginExample.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "OriginalFilename", "ExamplePlugin.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginMediaKey/PluginMediaKey.rc b/Plugins/PluginMediaKey/PluginMediaKey.rc index 2067ada0..63d85c57 100644 --- a/Plugins/PluginMediaKey/PluginMediaKey.rc +++ b/Plugins/PluginMediaKey/PluginMediaKey.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - poiru" VALUE "OriginalFilename", "PluginMediaKey.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginPerfMon/PluginPerfMon.rc b/Plugins/PluginPerfMon/PluginPerfMon.rc index 916061a7..08f8781f 100644 --- a/Plugins/PluginPerfMon/PluginPerfMon.rc +++ b/Plugins/PluginPerfMon/PluginPerfMon.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "OriginalFilename", "PluginPerfMon.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginPing/PluginPing.rc b/Plugins/PluginPing/PluginPing.rc index 131d09b0..c9c51f91 100644 --- a/Plugins/PluginPing/PluginPing.rc +++ b/Plugins/PluginPing/PluginPing.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "OriginalFilename", "PluginPing.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginPower/PluginPower.rc b/Plugins/PluginPower/PluginPower.rc index 0c72cc81..e4a31475 100644 --- a/Plugins/PluginPower/PluginPower.rc +++ b/Plugins/PluginPower/PluginPower.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "OriginalFilename", "PluginPower.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginQuote/PluginQuote.rc b/Plugins/PluginQuote/PluginQuote.rc index 3a460023..60c0ff19 100644 --- a/Plugins/PluginQuote/PluginQuote.rc +++ b/Plugins/PluginQuote/PluginQuote.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "OriginalFilename", "PluginQuote.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginRecycleManager/PluginRecycleManager.rc b/Plugins/PluginRecycleManager/PluginRecycleManager.rc index c8c5c8f5..386566bc 100644 --- a/Plugins/PluginRecycleManager/PluginRecycleManager.rc +++ b/Plugins/PluginRecycleManager/PluginRecycleManager.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - gschoppe" VALUE "OriginalFilename", "PluginRecycleManager.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginResMon/PluginResMon.rc b/Plugins/PluginResMon/PluginResMon.rc index 030aae2d..f83e4d01 100644 --- a/Plugins/PluginResMon/PluginResMon.rc +++ b/Plugins/PluginResMon/PluginResMon.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - David Negstad" VALUE "OriginalFilename", "PluginResMon.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginSpeedFan/PluginSpeedFan.rc b/Plugins/PluginSpeedFan/PluginSpeedFan.rc index dbcb57df..3af0e893 100644 --- a/Plugins/PluginSpeedFan/PluginSpeedFan.rc +++ b/Plugins/PluginSpeedFan/PluginSpeedFan.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "OriginalFilename", "PluginSpeedFan.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginSysInfo/PluginSysInfo.rc b/Plugins/PluginSysInfo/PluginSysInfo.rc index ab633a74..e5c52f5d 100644 --- a/Plugins/PluginSysInfo/PluginSysInfo.rc +++ b/Plugins/PluginSysInfo/PluginSysInfo.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy / Mordred" VALUE "OriginalFilename", "PluginSysInfo.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.rc b/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.rc index a1ad6fe2..6c38714f 100644 --- a/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.rc +++ b/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - Dexpot GbR" VALUE "OriginalFilename", "PluginVirtualDesktops.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginWebParser/PluginWebParser.rc b/Plugins/PluginWebParser/PluginWebParser.rc index 52842c42..bf979c03 100644 --- a/Plugins/PluginWebParser/PluginWebParser.rc +++ b/Plugins/PluginWebParser/PluginWebParser.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "OriginalFilename", "PluginWebParser.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginWifiStatus/PluginWifiStatus.rc b/Plugins/PluginWifiStatus/PluginWifiStatus.rc index e36a09da..3d139b56 100644 --- a/Plugins/PluginWifiStatus/PluginWifiStatus.rc +++ b/Plugins/PluginWifiStatus/PluginWifiStatus.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - nvme" VALUE "OriginalFilename", "PluginWifiStatus.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginWin7Audio/PluginWin7Audio.rc b/Plugins/PluginWin7Audio/PluginWin7Audio.rc index d9e4d263..272a4b04 100644 --- a/Plugins/PluginWin7Audio/PluginWin7Audio.rc +++ b/Plugins/PluginWin7Audio/PluginWin7Audio.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - Reiswaffle" VALUE "OriginalFilename", "PluginWin7Audio.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginWindowMessage/PluginWindowMessage.rc b/Plugins/PluginWindowMessage/PluginWindowMessage.rc index ee923c7f..be61a147 100644 --- a/Plugins/PluginWindowMessage/PluginWindowMessage.rc +++ b/Plugins/PluginWindowMessage/PluginWindowMessage.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "OriginalFilename", "PluginWindowMessage.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/Plugins/PluginiTunes/PluginiTunes.rc b/Plugins/PluginiTunes/PluginiTunes.rc index f41fb55e..837b7a6c 100644 --- a/Plugins/PluginiTunes/PluginiTunes.rc +++ b/Plugins/PluginiTunes/PluginiTunes.rc @@ -34,7 +34,11 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2010 - Elestel" VALUE "OriginalFilename", "PluginiTunes.dll" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", STRPRODUCTVER + #ifdef _WIN64 + VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" + #else + VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" + #endif //_WIN64 END END BLOCK "VarFileInfo" diff --git a/revision-number.h b/revision-number.h index f7b913a8..b8d2e868 100644 --- a/revision-number.h +++ b/revision-number.h @@ -1,8 +1,8 @@ #pragma once -#define FILEVER 1,4,0,593 -#define PRODUCTVER 1,4,0,593 -#define STRFILEVER "1.4.0.593" -#define STRPRODUCTVER "1.4.0.593 (64-bit)" +#define FILEVER 1,4,0,601 +#define PRODUCTVER 1,4,0,601 +#define STRFILEVER "1.4.0.601" +#define STRPRODUCTVER "1.4.0.601" -const int revision_number = 593; +const int revision_number = 601; const bool revision_beta = true; \ No newline at end of file