From 6b83509a7ebe42126068c3500e638cb64b1e32e8 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 9 Apr 2014 23:09:05 -0400 Subject: updated CMakeLists --- src/citra/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/citra') diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index 3a76b5045..e3ea4e41d 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 + emuwindow/emuwindow_glfw.cpp) # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) if (NOT X11_xf86vmode_LIB) -- cgit v1.2.3 From 9527fc74add2584de861a3a40fb313304c0108a7 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 9 Apr 2014 20:28:43 -0700 Subject: fixed a bunch of errors in CMakeLists --- src/citra/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/citra') diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index e3ea4e41d..c6913df57 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -1,5 +1,5 @@ set(SRCS citra.cpp - emuwindow/emuwindow_glfw.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) -- cgit v1.2.3 From b0ae99e1778e84f66dc1006386d2124e7345d0ce Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 10 Apr 2014 20:04:01 -0400 Subject: removed unused macros from citra.h --- src/citra/citra.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/citra') 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 - -#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" - -- cgit v1.2.3