From 6059a1d1b99186a28bcd3c60822bc8310724bfd4 Mon Sep 17 00:00:00 2001 From: jbzdarkid Date: Sat, 23 Nov 2019 14:14:32 -0800 Subject: Bump version --- App/Main.cpp | 3 ++- App/Version.h | 4 ++-- Installer/Installer.vdproj | 6 +++--- Source/Memory.h | 4 ++-- Test/Test.vcxproj | 4 ++++ 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/App/Main.cpp b/App/Main.cpp index 8df3e6e..edf0898 100644 --- a/App/Main.cpp +++ b/App/Main.cpp @@ -267,12 +267,13 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance // g_rngDebug = CreateWindow(L"STATIC", L"", // WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT, // 200, 80, 200, 200, g_hwnd, NULL, g_hInstance, NULL); - +#ifndef NDEBUG g_panelId = CreateText(200, 100, 100, L"59"); CreateButton(200, 130, 100, L"Read", TMP1); CreateButton(200, 160, 100, L"Write", TMP2); CreateButton(200, 190, 100, L"Solve", TMP3); CreateButton(200, 220, 100, L"Randomize2", TMP4); +#endif g_witnessProc->StartHeartbeat(g_hwnd); diff --git a/App/Version.h b/App/Version.h index 8068f03..1541697 100644 --- a/App/Version.h +++ b/App/Version.h @@ -3,8 +3,8 @@ #define TO_STRING2(s) L#s #define TO_STRING(s) TO_STRING2(s) -#define MAJOR 5 -#define MINOR 2 +#define MAJOR 6 +#define MINOR 0 #define PATCH 0 #define VERSION_STR TO_STRING(MAJOR) L"." TO_STRING(MINOR) L"." TO_STRING(PATCH) diff --git a/Installer/Installer.vdproj b/Installer/Installer.vdproj index e791590..61df575 100644 --- a/Installer/Installer.vdproj +++ b/Installer/Installer.vdproj @@ -162,15 +162,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Witness Randomizer" - "ProductCode" = "8:{5A3C6188-EA4B-4FEE-94EE-BF7D91681792}" - "PackageCode" = "8:{E8C66354-4ED4-4958-9D6C-A0DC3BD6C3EA}" + "ProductCode" = "8:{45A4772A-100E-4B94-B73A-F2F0C355D0F0}" + "PackageCode" = "8:{9D15D892-3C9C-4007-86A4-AA6BA2138CE9}" "UpgradeCode" = "8:{4CB5496B-A47E-41D3-B4A7-677E29AB7513}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:5.2.0" + "ProductVersion" = "8:6.0.0" "Manufacturer" = "8:jbzdarkid" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:https://www.github.com/jbzdarkid/witness-randomizer/issues" diff --git a/Source/Memory.h b/Source/Memory.h index b7edb28..5332cc3 100644 --- a/Source/Memory.h +++ b/Source/Memory.h @@ -5,8 +5,8 @@ #include #include -#define GLOBALS 0x5B28C0 -// #define GLOBALS 0x62D0A0 +// #define GLOBALS 0x5B28C0 +#define GLOBALS 0x62D0A0 #define HEARTBEAT 0x401 enum class ProcStatus { diff --git a/Test/Test.vcxproj b/Test/Test.vcxproj index d36f4af..9023285 100644 --- a/Test/Test.vcxproj +++ b/Test/Test.vcxproj @@ -67,6 +67,7 @@ true Console + UseLinkTimeCodeGeneration @@ -87,6 +88,7 @@ true Console + UseLinkTimeCodeGeneration @@ -107,6 +109,7 @@ Console true true + UseLinkTimeCodeGeneration @@ -127,6 +130,7 @@ Console true true + UseLinkTimeCodeGeneration -- cgit 1.4.1