diff options
| author |  bunnei | 2014-04-10 20:10:18 -0400 |
|---|---|---|
| committer | bunnei | 2014-04-10 20:10:18 -0400 |
| commit | 95f237a086ec4a9c95f673c96dde72e87eb616c2 (patch) | |
| tree | 02567879b41ecf28a59291f28b1ae138cc36a762 /src/citra | |
| parent | added initial modules for setting up SysCall HLE (diff) | |
| parent | removed scm_rev.h from version control (diff) | |
| download | yuzu-95f237a086ec4a9c95f673c96dde72e87eb616c2.tar.gz yuzu-95f237a086ec4a9c95f673c96dde72e87eb616c2.tar.xz yuzu-95f237a086ec4a9c95f673c96dde72e87eb616c2.zip | |
Merge branch 'master' into hle-interface
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/citra/citra.h | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index 3a76b5045..c6913df57 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | set(SRCS src/citra.cpp | 1 | set(SRCS citra.cpp |
| 2 | src/emuwindow/emuwindow_glfw.cpp) | 2 | emu_window/emu_window_glfw.cpp) |
| 3 | 3 | ||
| 4 | # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) | 4 | # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) |
| 5 | if (NOT X11_xf86vmode_LIB) | 5 | if (NOT X11_xf86vmode_LIB) |
diff --git a/src/citra/citra.h b/src/citra/citra.h index b9254c5da..b3b78a2dc 100644 --- a/src/citra/citra.h +++ b/src/citra/citra.h | |||
| @@ -4,12 +4,3 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <string> | ||
| 8 | |||
| 9 | #include "common/common.h" | ||
| 10 | |||
| 11 | #define APP_NAME std::string("citra") | ||
| 12 | #define APP_VERSION std::string("0.01-") + std::string(g_scm_rev_str) | ||
| 13 | #define APP_TITLE (APP_NAME + " " + APP_VERSION) | ||
| 14 | #define COPYRIGHT "Copyright (C) 2014 Citra Emulator" | ||
| 15 | |||