Merge branch 'M4xi1m3-omega-master' into omega-master

This commit is contained in:
Quentin
2019-11-10 13:58:38 +01:00
2 changed files with 5 additions and 5 deletions

View File

@@ -4,7 +4,7 @@ PLATFORM ?= device
DEBUG ?= 0
EPSILON_VERSION ?= 12.0.0
EPSILON_CUSTOM_VERSION ?= 1.13.9-0
EPSILON_CUSTOM_VERSION ?= 1.13.10-0
# USERNAME ?= N/A
# Valid values are "none", "update", "beta"
EPSILON_APPS ?= calculation rpn graph code statistics probability solver atom sequence regression settings

View File

@@ -69,14 +69,14 @@ private:
constexpr static uint32_t Magic = 0xDEC00DF0;
uint32_t m_header;
const char m_version[8];
const char m_customVersion[16];
#ifdef USERNAME
const char m_username[16];
#endif
const char m_patchLevel[8];
void * m_storageAddress;
size_t m_storageSize;
uint32_t m_footer;
const char m_customVersion[16];
#ifdef USERNAME
const char m_username[16];
#endif
};
constexpr PlatformInfo HEADER_SECTION platform_infos;