From 8296cbe0463387b9c0b3e23e8f60f6da536d4bcf Mon Sep 17 00:00:00 2001 From: bubnikv <bubnikv@gmail.com> Date: Mon, 24 Sep 2018 13:07:50 +0200 Subject: [PATCH] Compile Slic3r versions into slic3r binary --- src/slic3r/GUI/MainFrame.cpp | 6 +++--- version.inc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index e97eab7ae..270320f39 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -26,7 +26,7 @@ namespace GUI { static wxString dots("…", wxConvUTF8); MainFrame::MainFrame(const bool no_plater, const bool loaded) : -wxFrame(NULL, wxID_ANY, "FORK_NAME-VERSION", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE), +wxFrame(NULL, wxID_ANY, SLIC3R_BUILD, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE), m_no_plater(no_plater), m_loaded(loaded) { @@ -54,8 +54,8 @@ wxFrame(NULL, wxID_ANY, "FORK_NAME-VERSION", wxDefaultPosition, wxDefaultSize, w // initialize status bar m_statusbar = new Slic3r::GUI::ProgressStatusBar(this); m_statusbar->embed(this); - m_statusbar->set_status_text(_(L("Version ")) + - "Slic3r_VERSION" + // Slic3r::VERSION + + m_statusbar->set_status_text(_(L("Version ")) + + SLIC3R_VERSION + _(L(" - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"))); // m_appController->set_model(m_plater->model); diff --git a/version.inc b/version.inc index 5a23105a8..95e2741dd 100644 --- a/version.inc +++ b/version.inc @@ -3,7 +3,7 @@ set(SLIC3R_FORK_NAME "Slic3r Prusa Edition") set(SLIC3R_VERSION "1.42.0-alpha") -set(SLIC3R_BUILD "UNKNOWN") +set(SLIC3R_BUILD "${SLIC3R_VERSION}+UNKNOWN") +set(SLIC3R_BUILD_ID "${SLIC3R_BUILD_ID}") set(SLIC3R_RC_VERSION "1,42,0,0") set(SLIC3R_RC_VERSION_DOTS "1.42.0.0") -set(SLIC3R_BUILD_ID "${SLIC3R_VERSION}+${SLIC3R_BUILD}")