diff --git a/Update_Version.ps1 b/Update_Version.ps1
index cbe8695..5433df8 100644
--- a/Update_Version.ps1
+++ b/Update_Version.ps1
@@ -45,6 +45,7 @@ function makeVersionString([string]$vmaj, [string]$vmin, [string]$vbld, [string]
[string]$buildDateTime = [string]$vs = [string]$vn = [string]$intName = [string]$origName = $null
[int]$pys = [int]$spanDays = [int]$spanSecs = $null
[int]$currentYear = [int]$currentMonth = [int]$currentDay = [int]$currentHour = [int]$currentMinute = [int]$currentSecond = $null
+[string]$platformArch = $args[0]
[string]$iniFile = ".\Version.ini"
#endregion
@@ -103,8 +104,8 @@ $currentSecond = $date.Second
$buildDateTime = "Build date: $($date.GetDateTimeFormats('u').Replace('Z', ''))"
$spanDays = [math]::Round((New-TimeSpan -Start $(Get-Date -Month 1 -Day 1 -Year 2000) -End $date).TotalDays)
$spanSecs = [math]::Round((New-TimeSpan -Start $($date.Date) -End $($date.DateTime)).TotalSeconds)
-if ($pys -eq $currentYear) { $pcf = "Copyright (C) $pys by $pa" } else { $pcf = "Copyright (C) $pys-$currentYear by $pa" }
-$intName = "$pn-C++"
+if ($pys -eq $currentYear) { $pcf = "Copyright (c) $pys $pa" } else { $pcf = "Copyright (c) $pys-$currentYear $pa" }
+$intName = "$pn-$platformArch-C++"
$origName = "$pn.exe"
$verMajor = getValue $verMajor
$verMinor = getValue $verMinor
@@ -125,6 +126,8 @@ else {
$pnf = "$pn v$vs"
}
+$pnf = "$pn v$vs ($platformArch)"
+
#region Save all variables to file
"// $pn" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode
"// VersionInfo.h" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
@@ -157,6 +160,7 @@ else {
# echo " verPatch: [$verPatch]"
# echo ""
# echo " aboutBuild: [$aboutBuild]"
+# echo " platformArch: [$platformArch]"
# echo " productNameFull: [$pnf]"
# echo "productCopyrightFull: [$pcf]"
# echo " internalName: [$intName]"
diff --git a/pre-build.cmd b/pre-build.cmd
index f063674..baf30cb 100644
--- a/pre-build.cmd
+++ b/pre-build.cmd
@@ -1,16 +1,18 @@
@ECHO OFF
REM In VisualStudio add to Pre-Build events:
-REM "$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)"
+REM "$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"
REM Then in "Resource Includes..." add '#include "VersionInfo.rc"' into 'Compile-time Directives'
IF "%~1" == "" GOTO :no_args
IF "%~2" == "" GOTO :no_args
+IF "%~3" == "" GOTO :no_args
SET solutionDir=%1
SET projectDir=%2
+SET platformArch=%3
CD /D %solutionDir%
-powershell -ExecutionPolicy RemoteSigned -File Update_Version.ps1
+powershell -ExecutionPolicy RemoteSigned -File Update_Version.ps1 %platformArch%
MOVE /Y %solutionDir%VersionInfo.h %projectDir%VersionInfo.h
EXIT
diff --git a/wCenterWindow/CLogger.cpp b/wCenterWindow/CLogger.cpp
index b95d67a..fe5e0a4 100644
--- a/wCenterWindow/CLogger.cpp
+++ b/wCenterWindow/CLogger.cpp
@@ -64,27 +64,6 @@ CLogger::CLogger(const wchar_t* _appTitle) {
Init();
}
-CLogger::CLogger(const wchar_t* _appTitle, const wchar_t* _appVersion) {
- szAppTitle = _appTitle; szAppVersion = _appVersion;
- szAppTitleVer = _appTitle;
- szAppTitleVer.append(L", v").append(_appVersion);
- Init();
-}
-
-CLogger::CLogger(const wchar_t* _appTitle, const uint8_t _appPlatform) {
- szAppTitle = _appTitle; szAppPlatform = std::to_wstring(_appPlatform);
- szAppTitleVer = _appTitle;
- szAppTitleVer.append(L" (x").append(szAppPlatform).append(L")");
- Init();
-}
-
-CLogger::CLogger(const wchar_t* _appTitle, const wchar_t* _appVersion, const uint8_t _appPlatform) {
- szAppTitle = _appTitle; szAppVersion = _appVersion; szAppPlatform = std::to_wstring(_appPlatform);
- szAppTitleVer = _appTitle;
- szAppTitleVer.append(L", v").append(_appVersion).append(L" (x").append(szAppPlatform).append(L")");
- Init();
-}
-
CLogger::~CLogger() {
if (fsLogFile) {
fsLogFile << GetTimeStamp() << "Stop log." << std::endl;
diff --git a/wCenterWindow/CLogger.h b/wCenterWindow/CLogger.h
index bacb5e3..c0f2d53 100644
--- a/wCenterWindow/CLogger.h
+++ b/wCenterWindow/CLogger.h
@@ -11,9 +11,6 @@ class CLogger
public:
void Out(const wchar_t*, ...);
CLogger(const wchar_t*);
- CLogger(const wchar_t*, const wchar_t*);
- CLogger(const wchar_t*, const uint8_t);
- CLogger(const wchar_t*, const wchar_t*, const uint8_t);
~CLogger();
private:
diff --git a/wCenterWindow/wCenterWindow.cpp b/wCenterWindow/wCenterWindow.cpp
index 89b6bff..029f637 100644
--- a/wCenterWindow/wCenterWindow.cpp
+++ b/wCenterWindow/wCenterWindow.cpp
@@ -31,10 +31,7 @@ HMENU hMenu = NULL, hPopup = NULL;
HWND hFgWnd = NULL;
BOOL bKPressed = FALSE, bMPressed = FALSE, fShowIcon = TRUE, fCheckUpdates = TRUE, bWorkArea = TRUE;
BOOL bLCTRL = FALSE, bLWIN = FALSE, bKEYV = FALSE;
-//CLogger logger(TEXT(PRODUCT_NAME), TEXT(VERSION_STR), ARCH);
-//CLogger logger(TEXT(PRODUCT_NAME), TEXT(VERSION_STR));
-//CLogger logger(TEXT(PRODUCT_NAME), ARCH);
-CLogger logger(TEXT(PRODUCT_NAME));
+CLogger logger(TEXT(PRODUCT_NAME_FULL));
NOTIFYICONDATAW nid = { 0 };
MENUITEMINFO mii = { 0 };
diff --git a/wCenterWindow/wCenterWindow.vcxproj b/wCenterWindow/wCenterWindow.vcxproj
index 2365b79..0140ef7 100644
--- a/wCenterWindow/wCenterWindow.vcxproj
+++ b/wCenterWindow/wCenterWindow.vcxproj
@@ -112,7 +112,7 @@
- "$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)"
+ "$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"
@@ -137,7 +137,7 @@
%(AdditionalManifestFiles)
- "$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)"
+ "$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"
@@ -151,13 +151,13 @@
Windows
true
- comctl32.lib;%(AdditionalDependencies)
+ comctl32.lib;wininet.lib;%(AdditionalDependencies)
%(AdditionalManifestFiles)
- powershell -File "$(SolutionDir)Update_Version.ps1" move /y "$(SolutionDir)VersionInfo.h" "$(ProjectDir)"
+ "$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"
@@ -176,13 +176,13 @@
true
true
false
- comctl32.lib;%(AdditionalDependencies)
+ comctl32.lib;wininet.lib;%(AdditionalDependencies)
%(AdditionalManifestFiles)
- powershell -File "$(SolutionDir)Update_Version.ps1" move /y "$(SolutionDir)VersionInfo.h" "$(ProjectDir)"
+ "$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"
diff --git a/wCenterWindow/wCenterWindow.vcxproj.filters b/wCenterWindow/wCenterWindow.vcxproj.filters
index d44e6e5..ec656a6 100644
--- a/wCenterWindow/wCenterWindow.vcxproj.filters
+++ b/wCenterWindow/wCenterWindow.vcxproj.filters
@@ -27,27 +27,24 @@
Header Files
-
- Header Files
-
-
- Header Files
-
Header Files
Header Files
+
+ Header Files
+
Source Files
-
+
Source Files
-
+
Source Files