From f5f28a4f6773e00e0f53454e881fb6d46dfbe6da Mon Sep 17 00:00:00 2001
From: James Rowe <jroweboy@gmail.com>
Date: Thu, 11 Jan 2018 20:38:17 -0700
Subject: [PATCH] Get yuzu sdl to start compiling
---
src/yuzu_cmd/CMakeLists.txt | 4 ++--
src/yuzu_cmd/config.cpp | 5 +++--
src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 6 ++----
src/yuzu_cmd/{citra.cpp => yuzu.cpp} | 5 +++--
src/yuzu_cmd/{citra.rc => yuzu.rc} | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
rename src/yuzu_cmd/{citra.cpp => yuzu.cpp} (98%)
rename src/yuzu_cmd/{citra.rc => yuzu.rc} (68%)
diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt
index c6c527eb66..802e060f43 100644
--- a/src/yuzu_cmd/CMakeLists.txt
+++ b/src/yuzu_cmd/CMakeLists.txt
@@ -2,9 +2,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
set(SRCS
emu_window/emu_window_sdl2.cpp
- citra.cpp
config.cpp
- citra.rc
+ yuzu.cpp
+ yuzu.rc
)
set(HEADERS
emu_window/emu_window_sdl2.h
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index 94d1a9f1c7..eee3f5c5e6 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -5,13 +5,14 @@
#include <memory>
#include <SDL.h>
#include <inih/cpp/INIReader.h>
-#include "citra/config.h"
-#include "citra/default_ini.h"
#include "common/file_util.h"
#include "common/logging/log.h"
#include "common/param_package.h"
#include "core/settings.h"
#include "input_common/main.h"
+#include "yuzu_cmd/config.h"
+#include "yuzu_cmd/default_ini.h"
+
Config::Config() {
// TODO: Don't hardcode the path; let the frontend decide where to put the config files.
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
index e65b04e4b5..7cbffba523 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
@@ -8,7 +8,6 @@
#define SDL_MAIN_HANDLED
#include <SDL.h>
#include <glad/glad.h>
-#include "citra/emu_window/emu_window_sdl2.h"
#include "common/logging/log.h"
#include "common/scm_rev.h"
#include "common/string_util.h"
@@ -16,7 +15,8 @@
#include "input_common/keyboard.h"
#include "input_common/main.h"
#include "input_common/motion_emu.h"
-#include "network/network.h"
+#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
+
void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) {
TouchMoved((unsigned)std::max(x, 0), (unsigned)std::max(y, 0));
@@ -59,7 +59,6 @@ void EmuWindow_SDL2::OnResize() {
EmuWindow_SDL2::EmuWindow_SDL2() {
InputCommon::Init();
- Network::Init();
SDL_SetMainReady();
@@ -116,7 +115,6 @@ EmuWindow_SDL2::~EmuWindow_SDL2() {
SDL_GL_DeleteContext(gl_context);
SDL_Quit();
- Network::Shutdown();
InputCommon::Shutdown();
}
diff --git a/src/yuzu_cmd/citra.cpp b/src/yuzu_cmd/yuzu.cpp
similarity index 98%
rename from src/yuzu_cmd/citra.cpp
rename to src/yuzu_cmd/yuzu.cpp
index e524c55356..5efbf3910c 100644
--- a/src/yuzu_cmd/citra.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -24,8 +24,6 @@
#include <shellapi.h>
#endif
-#include "citra/config.h"
-#include "citra/emu_window/emu_window_sdl2.h"
#include "common/logging/backend.h"
#include "common/logging/filter.h"
#include "common/logging/log.h"
@@ -36,6 +34,9 @@
#include "core/gdbstub/gdbstub.h"
#include "core/loader/loader.h"
#include "core/settings.h"
+#include "yuzu_cmd/config.h"
+#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
+
static void PrintHelp(const char* argv0) {
std::cout << "Usage: " << argv0
diff --git a/src/yuzu_cmd/citra.rc b/src/yuzu_cmd/yuzu.rc
similarity index 68%
rename from src/yuzu_cmd/citra.rc
rename to src/yuzu_cmd/yuzu.rc
index c490ef302c..7cb8a14e1e 100644
--- a/src/yuzu_cmd/citra.rc
+++ b/src/yuzu_cmd/yuzu.rc
@@ -6,7 +6,7 @@
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-CITRA_ICON ICON "../../dist/citra.ico"
+CITRA_ICON ICON "../../dist/yuzu.ico"
/////////////////////////////////////////////////////////////////////////////
@@ -14,4 +14,4 @@ CITRA_ICON ICON "../../dist/citra.ico"
// RT_MANIFEST
//
-1 RT_MANIFEST "../../dist/citra.manifest"
+1 RT_MANIFEST "../../dist/yuzu.manifest"