franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get yuzu sdl to start compiling

Browse Source
This commit is contained in:
James Rowe 2018-01-11 20:38:17 -07:00
parent 389979018c
commit f5f28a4f67
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/yuzu_cmd/CMakeLists.txt
View File

@ -2,9 +2,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
set(SRCS set(SRCS
emu_window/emu_window_sdl2.cpp emu_window/emu_window_sdl2.cpp
citra.cpp
config.cpp config.cpp
citra.rc yuzu.cpp
yuzu.rc
) )
set(HEADERS set(HEADERS
emu_window/emu_window_sdl2.h emu_window/emu_window_sdl2.h

5
src/yuzu_cmd/config.cpp
View File

@ -5,13 +5,14 @@
#include <memory> #include <memory>
#include <SDL.h> #include <SDL.h>
#include <inih/cpp/INIReader.h> #include <inih/cpp/INIReader.h>
#include "citra/config.h"
#include "citra/default_ini.h"
#include "common/file_util.h" #include "common/file_util.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/param_package.h" #include "common/param_package.h"
#include "core/settings.h" #include "core/settings.h"
#include "input_common/main.h" #include "input_common/main.h"
#include "yuzu_cmd/config.h"
#include "yuzu_cmd/default_ini.h"
Config::Config() { Config::Config() {
// TODO: Don't hardcode the path; let the frontend decide where to put the config files. // TODO: Don't hardcode the path; let the frontend decide where to put the config files.

6
src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
View File

@ -8,7 +8,6 @@
#define SDL_MAIN_HANDLED #define SDL_MAIN_HANDLED
#include <SDL.h> #include <SDL.h>
#include <glad/glad.h> #include <glad/glad.h>
#include "citra/emu_window/emu_window_sdl2.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/scm_rev.h" #include "common/scm_rev.h"
#include "common/string_util.h" #include "common/string_util.h"
@ -16,7 +15,8 @@
#include "input_common/keyboard.h" #include "input_common/keyboard.h"
#include "input_common/main.h" #include "input_common/main.h"
#include "input_common/motion_emu.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) { void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) {
TouchMoved((unsigned)std::max(x, 0), (unsigned)std::max(y, 0)); TouchMoved((unsigned)std::max(x, 0), (unsigned)std::max(y, 0));
@ -59,7 +59,6 @@ void EmuWindow_SDL2::OnResize() {
EmuWindow_SDL2::EmuWindow_SDL2() { EmuWindow_SDL2::EmuWindow_SDL2() {
InputCommon::Init(); InputCommon::Init();
Network::Init();
SDL_SetMainReady(); SDL_SetMainReady();
@ -116,7 +115,6 @@ EmuWindow_SDL2::~EmuWindow_SDL2() {
SDL_GL_DeleteContext(gl_context); SDL_GL_DeleteContext(gl_context);
SDL_Quit(); SDL_Quit();
Network::Shutdown();
InputCommon::Shutdown(); InputCommon::Shutdown();
} }

5
src/yuzu_cmd/citra.cpp → src/yuzu_cmd/yuzu.cpp
View File

@ -24,8 +24,6 @@
#include <shellapi.h> #include <shellapi.h>
#endif #endif
#include "citra/config.h"
#include "citra/emu_window/emu_window_sdl2.h"
#include "common/logging/backend.h" #include "common/logging/backend.h"
#include "common/logging/filter.h" #include "common/logging/filter.h"
#include "common/logging/log.h" #include "common/logging/log.h"
@ -36,6 +34,9 @@
#include "core/gdbstub/gdbstub.h" #include "core/gdbstub/gdbstub.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
#include "core/settings.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) { static void PrintHelp(const char* argv0) {
std::cout << "Usage: " << argv0 std::cout << "Usage: " << argv0

4
src/yuzu_cmd/citra.rc → src/yuzu_cmd/yuzu.rc
View File

@ -6,7 +6,7 @@
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // 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 // RT_MANIFEST
// //
1 RT_MANIFEST "../../dist/citra.manifest" 1 RT_MANIFEST "../../dist/yuzu.manifest"