diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 5 | ||||
| -rw-r--r-- | src/citra_qt/main.cpp | 2 | ||||
| -rw-r--r-- | src/common/scm_rev.cpp.in | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 7699ca8d0..c7eb2aafc 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -19,11 +19,6 @@ | |||
| 19 | #include "video_core/debug_utils/debug_utils.h" | 19 | #include "video_core/debug_utils/debug_utils.h" |
| 20 | #include "video_core/video_core.h" | 20 | #include "video_core/video_core.h" |
| 21 | 21 | ||
| 22 | #define APP_NAME "citra" | ||
| 23 | #define APP_VERSION "0.1-" VERSION | ||
| 24 | #define APP_TITLE APP_NAME " " APP_VERSION | ||
| 25 | #define COPYRIGHT "Copyright (C) 2013-2014 Citra Team" | ||
| 26 | |||
| 27 | EmuThread::EmuThread(GRenderWindow* render_window) | 22 | EmuThread::EmuThread(GRenderWindow* render_window) |
| 28 | : exec_step(false), running(false), stop_run(false), render_window(render_window) {} | 23 | : exec_step(false), running(false), stop_run(false), render_window(render_window) {} |
| 29 | 24 | ||
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index ad6221739..3e3c92f24 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -212,7 +212,7 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) { | |||
| 212 | SLOT(OnMenuLoadFile())); | 212 | SLOT(OnMenuLoadFile())); |
| 213 | connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this, | 213 | connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this, |
| 214 | SLOT(OnStartGame())); | 214 | SLOT(OnStartGame())); |
| 215 | connect(GetHotkey("Main Window", "Swap Screens", this), SIGNAL(activated()), this, | 215 | connect(GetHotkey("Main Window", "Swap Screens", render_window), SIGNAL(activated()), this, |
| 216 | SLOT(OnSwapScreens())); | 216 | SLOT(OnSwapScreens())); |
| 217 | 217 | ||
| 218 | std::string window_title = | 218 | std::string window_title = |
diff --git a/src/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.in index 09366e801..79b404bb8 100644 --- a/src/common/scm_rev.cpp.in +++ b/src/common/scm_rev.cpp.in | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | 1 | // Copyright 2014 Citra Emulator Project |
| 2 | // Licensed under GPLv2 | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "common/scm_rev.h" | 5 | #include "common/scm_rev.h" |