diff --git a/src/EmulationStation.h b/src/EmulationStation.h index 666fdccd5..d87539eb6 100644 --- a/src/EmulationStation.h +++ b/src/EmulationStation.h @@ -2,12 +2,12 @@ // These numbers and strings need to be manually updated for a new version. // Do this version number update as the very last commit for the new release version. -#define PROGRAM_VERSION_MAJOR 1 +#define PROGRAM_VERSION_MAJOR 2 #define PROGRAM_VERSION_MINOR 0 -#define PROGRAM_VERSION_MAINTENANCE 2 -#define PROGRAM_VERSION_REVISION 0 -#define PROGRAM_VERSION_STRING "1.0.2.0" -#define PROGRAM_BUILT_STRING __DATE__ " - " __TIME__ -#define RESOURCE_VERSION_STRING "1,0,2,0\0" +#define PROGRAM_VERSION_MAINTENANCE 0 +#define PROGRAM_VERSION_STRING "2.0.0-rc1" -#define RESOURCE_VERSION PROGRAM_VERSION_MAJOR,PROGRAM_VERSION_MINOR,PROGRAM_VERSION_MAINTENANCE,PROGRAM_VERSION_REVISION +#define PROGRAM_BUILT_STRING __DATE__ " - " __TIME__ + +#define RESOURCE_VERSION_STRING "2,0,0\0" +#define RESOURCE_VERSION PROGRAM_VERSION_MAJOR,PROGRAM_VERSION_MINOR,PROGRAM_VERSION_MAINTENANCE diff --git a/src/guis/GuiMenu.cpp b/src/guis/GuiMenu.cpp index e4c7b8a4b..0a27abbab 100644 --- a/src/guis/GuiMenu.cpp +++ b/src/guis/GuiMenu.cpp @@ -218,7 +218,7 @@ GuiMenu::GuiMenu(Window* window) : GuiComponent(window), mMenu(window, "MAIN MEN mVersion.setFont(Font::get(FONT_SIZE_SMALL)); mVersion.setColor(0xC6C6C6FF); - mVersion.setText("EMULATIONSTATION V" PROGRAM_VERSION_STRING); + mVersion.setText("EMULATIONSTATION V" + strToUpper(PROGRAM_VERSION_STRING)); mVersion.setAlignment(ALIGN_CENTER); addChild(&mMenu);