diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-10 07:22:22 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-10 07:22:22 +0100 |
| commit | aa61bbe9e414648399aff2802df5b587dee1a084 (patch) | |
| tree | ff7809bea445bb76c9fd27a3245e1b2cb7c72596 /config.h.in | |
| parent | 3f5c46a1c4b27e82976e0067e4ec2d6abfffd9ba (diff) | |
| parent | 712b87c643bbd7bc4ed2cfd459d0b9fdb69e5f0d (diff) | |
| download | MultiMC-aa61bbe9e414648399aff2802df5b587dee1a084.tar MultiMC-aa61bbe9e414648399aff2802df5b587dee1a084.tar.gz MultiMC-aa61bbe9e414648399aff2802df5b587dee1a084.tar.lz MultiMC-aa61bbe9e414648399aff2802df5b587dee1a084.tar.xz MultiMC-aa61bbe9e414648399aff2802df5b587dee1a084.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Conflicts:
CMakeLists.txt
gui/MainWindow.cpp
Diffstat (limited to 'config.h.in')
| -rw-r--r-- | config.h.in | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/config.h.in b/config.h.in index 34841817..b58dc322 100644 --- a/config.h.in +++ b/config.h.in @@ -1,16 +1,18 @@ +// Minor and major version, used to communicate changes to users. #define VERSION_MAJOR @MultiMC_VERSION_MAJOR@ #define VERSION_MINOR @MultiMC_VERSION_MINOR@ + +// Build number, channel, and type -- number and channel are used by the updater, type is purely visual #define VERSION_BUILD @MultiMC_VERSION_BUILD@ +#define VERSION_CHANNEL "@MultiMC_VERSION_CHANNEL@" #define VERSION_BUILD_TYPE "@MultiMC_VERSION_BUILD_TYPE@" -#define GIT_COMMIT "@MultiMC_GIT_COMMIT@" - -#define VERSION_STR "@MultiMC_VERSION_STRING@" - -#define x86 1 -#define x64 2 +// URL for the updater's channel +#define CHANLIST_URL "@MultiMC_CHANLIST_URL@" -#define ARCH @MultiMC_ARCH@ +// The commit hash of this build +#define GIT_COMMIT "@MultiMC_GIT_COMMIT@" -#define USE_HTTPS @MultiMC_USE_HTTPS@ +// This is printed on start to standard output +#define VERSION_STR "@MultiMC_VERSION_STRING@" |