diff options
| author | JosJuice <josjuice@gmail.com> | 2017-09-10 08:02:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-10 08:02:48 +0200 |
| commit | ee51ba639908ccbb13c3389344d17d3bbae2da1a (patch) | |
| tree | 02ccf253c0a7196dbcafd99524c07801d42c4791 /Source/Core/DolphinWX/Main.cpp | |
| parent | e86713ca6726393f4b5a2dd2240b79828d6fcb4b (diff) | |
| parent | 696e1b40b58ee1ef9340ceac02059abbe63f3120 (diff) | |
Merge pull request #6047 from lioncash/version
Common: Move version strings to their own header
Diffstat (limited to 'Source/Core/DolphinWX/Main.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 7df2d3ef71..bff1c34adb 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -31,6 +31,7 @@ #include "Common/Logging/LogManager.h" #include "Common/MsgHandler.h" #include "Common/Thread.h" +#include "Common/Version.h" #include "Core/Analytics.h" #include "Core/ConfigManager.h" @@ -151,7 +152,7 @@ bool DolphinApp::OnInit() // event dispatch including WM_MOVE/WM_SIZE) wxRect window_geometry(SConfig::GetInstance().iPosX, SConfig::GetInstance().iPosY, SConfig::GetInstance().iWidth, SConfig::GetInstance().iHeight); - main_frame = new CFrame(nullptr, wxID_ANY, StrToWxStr(scm_rev_str), window_geometry, + main_frame = new CFrame(nullptr, wxID_ANY, StrToWxStr(Common::scm_rev_str), window_geometry, m_use_debugger, m_batch_mode, m_use_logger); SetTopWindow(main_frame); |