diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-04-10 20:10:18 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-04-10 20:10:18 -0400 |
| commit | 95f237a086ec4a9c95f673c96dde72e87eb616c2 (patch) | |
| tree | 02567879b41ecf28a59291f28b1ae138cc36a762 /src/citra | |
| parent | f68de21ad1cd267029b60ee3767d219c46f5fba0 (diff) | |
| parent | 17b32b7b3fa54ab2c5754db79df560052758236d (diff) | |
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 @@ -set(SRCS src/citra.cpp - src/emuwindow/emuwindow_glfw.cpp) +set(SRCS citra.cpp + emu_window/emu_window_glfw.cpp) # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) 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 @@ #pragma once -#include <string> - -#include "common/common.h" - -#define APP_NAME std::string("citra") -#define APP_VERSION std::string("0.01-") + std::string(g_scm_rev_str) -#define APP_TITLE (APP_NAME + " " + APP_VERSION) -#define COPYRIGHT "Copyright (C) 2014 Citra Emulator" - |