diff --git a/ZRCola.sln b/ZRCola.sln index cf48daa..8913c7f 100644 --- a/ZRCola.sln +++ b/ZRCola.sln @@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\bu EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CFEBC17E-C840-4507-BDE6-1EF5B52DDCC5}" ProjectSection(SolutionItems) = preProject - include\zrcola.h = include\zrcola.h + include\version.h = include\version.h EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\build\libZRCola.vcxproj", "{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}" diff --git a/ZRCola/ZRCola.rc b/ZRCola/ZRCola.rc index 2b2fbf3..9cff780 100644 Binary files a/ZRCola/ZRCola.rc and b/ZRCola/ZRCola.rc differ diff --git a/ZRCola/stdafx.h b/ZRCola/stdafx.h index 31cdc2d..63caac8 100644 --- a/ZRCola/stdafx.h +++ b/ZRCola/stdafx.h @@ -19,7 +19,7 @@ #pragma once -#include "../include/zrcola.h" +#include "../include/version.h" #include "zrcolaabout.h" #include "zrcolaapp.h" #include "zrcolachrcatpnl.h" diff --git a/ZRColaCompile/ZRColaCompile.rc b/ZRColaCompile/ZRColaCompile.rc index bc25a8c..a8e3487 100644 Binary files a/ZRColaCompile/ZRColaCompile.rc and b/ZRColaCompile/ZRColaCompile.rc differ diff --git a/ZRColaCompile/stdafx.h b/ZRColaCompile/stdafx.h index 27aa835..1aab67f 100644 --- a/ZRColaCompile/stdafx.h +++ b/ZRColaCompile/stdafx.h @@ -19,7 +19,7 @@ #pragma once -#include "../include/zrcola.h" +#include "../include/version.h" #include "dbsource.h" #include diff --git a/ZRColaInstall/ZRColaInstall.rc b/ZRColaInstall/ZRColaInstall.rc index 39e4be9..c20df64 100644 Binary files a/ZRColaInstall/ZRColaInstall.rc and b/ZRColaInstall/ZRColaInstall.rc differ diff --git a/ZRColaUtils.sln b/ZRColaUtils.sln index 19cb034..7907dc7 100644 --- a/ZRColaUtils.sln +++ b/ZRColaUtils.sln @@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{ECE3F336-FFD2-41EE-AD8F-17BD7472BDCB}" ProjectSection(SolutionItems) = preProject - include\zrcola.h = include\zrcola.h + include\version.h = include\version.h EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaCompile", "ZRColaCompile\ZRColaCompile.vcxproj", "{87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}" diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak index 084a7ac..7409042 100644 Binary files a/include/MSIBuildCfg.mak and b/include/MSIBuildCfg.mak differ diff --git a/include/UpdaterCfg.h b/include/UpdaterCfg.h index 8cdc372..3d1bbc5 100644 --- a/include/UpdaterCfg.h +++ b/include/UpdaterCfg.h @@ -1,4 +1,4 @@ -#include "zrcola.h" +#include "version.h" // // Update server(s) diff --git a/include/zrcola.h b/include/version.h similarity index 84% rename from include/zrcola.h rename to include/version.h index a09c32b..7476c1f 100644 --- a/include/zrcola.h +++ b/include/version.h @@ -23,7 +23,7 @@ // Product version as a single DWORD // Note: Used for version comparison within C/C++ code. // -#define ZRCOLA_VERSION 0x01ff1300 +#define ZRCOLA_VERSION 0x01ff1400 // // Product version by components @@ -33,26 +33,26 @@ // #define ZRCOLA_VERSION_MAJ 1 #define ZRCOLA_VERSION_MIN 255 -#define ZRCOLA_VERSION_REV 19 +#define ZRCOLA_VERSION_REV 20 #define ZRCOLA_VERSION_BUILD 0 // // Human readable product version and build year for UI // -#define ZRCOLA_VERSION_STR "2.0-beta10" +#define ZRCOLA_VERSION_STR "2.0-beta11" #define ZRCOLA_BUILD_YEAR_STR "2016" // // Numerical version presentation for ProductVersion propery in // MSI packages (syntax: N.N[.N[.N]]) // -#define ZRCOLA_VERSION_INST "1.255.19" +#define ZRCOLA_VERSION_INST "1.255.20" // // The product code for ProductCode property in MSI packages // Replace with new on every version change, regardless how minor it is. // -#define ZRCOLA_VERSION_GUID "{DD261422-947E-4BB4-BCCE-8528EEEAD8C0}" +#define ZRCOLA_VERSION_GUID "{C949BB90-B6B2-4268-95DA-0C4533595E1A}" // // The product vendor and application name for configuration keeping. diff --git a/lib/libZRCola/res/libZRCola.rc b/lib/libZRCola/res/libZRCola.rc index e9eab86..d14dab3 100644 Binary files a/lib/libZRCola/res/libZRCola.rc and b/lib/libZRCola/res/libZRCola.rc differ diff --git a/lib/libZRCola/src/stdafx.h b/lib/libZRCola/src/stdafx.h index 9a338c4..dc4a349 100644 --- a/lib/libZRCola/src/stdafx.h +++ b/lib/libZRCola/src/stdafx.h @@ -19,7 +19,7 @@ #pragma once -#include "../../../include/zrcola.h" +#include "../../../include/version.h" #include "../include/zrcola/character.h" #include "../include/zrcola/language.h" diff --git a/lib/libZRColaUI/res/libZRColaUI.rc b/lib/libZRColaUI/res/libZRColaUI.rc index 1f3791f..8403e2b 100644 Binary files a/lib/libZRColaUI/res/libZRColaUI.rc and b/lib/libZRColaUI/res/libZRColaUI.rc differ diff --git a/lib/libZRColaUI/src/stdafx.h b/lib/libZRColaUI/src/stdafx.h index 09f9f87..a5c55ca 100644 --- a/lib/libZRColaUI/src/stdafx.h +++ b/lib/libZRColaUI/src/stdafx.h @@ -19,7 +19,7 @@ #pragma once -#include "../../../include/zrcola.h" +#include "../../../include/version.h" #include "../include/zrcolaui/chargroup.h" #include "../include/zrcolaui/keyboard.h"