Exverge/suyu
3
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

fixed license headers in citra project

Browse source
This commit is contained in:
bunnei 2014-04-08 20:25:53 -04:00
parent 73663409eb
commit ad4fffca0d
4 changed files with 16 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/citra/citra.cpp
View file

@ -1,26 +1,6 @@
/** // Copyright 2014 Citra Emulator Project
* Copyright (C) 2013 citra Emulator // Licensed under GPLv2
* // Refer to the license.txt file included.
* @file citra.cpp
* @author ShizZy <shizzy247@gmail.com>
* @date 2013-09-04
* @brief Main entry point
*
* @section LICENSE
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details at
* http://www.gnu.org/copyleft/gpl.html
*
* Official project repository can be found at:
* http://code.google.com/p/gekko-gc-emu/
*/
#include "common/common.h" #include "common/common.h"
#include "common/log_manager.h" #include "common/log_manager.h"
@ -34,16 +14,8 @@
#include "citra/citra.h" #include "citra/citra.h"
#define E_ERR -1
//#define PLAY_FIFO_RECORDING
/// Application entry point /// Application entry point
int __cdecl main(int argc, char **argv) { int __cdecl main(int argc, char **argv) {
//u32 tight_loop;
printf("citra starting...\n");
std::string program_dir = File::GetCurrentDir(); std::string program_dir = File::GetCurrentDir();
LogManager::Init(); LogManager::Init();
@ -52,7 +24,7 @@ int __cdecl main(int argc, char **argv) {
System::Init(emu_window); System::Init(emu_window);
std::string boot_filename = "C:\\Users\\eric\\Desktop\\3ds\\homebrew\\Mandelbrot3DS.elf"; std::string boot_filename = "homebrew.elf";
std::string error_str; std::string error_str;
bool res = Loader::LoadFile(boot_filename, &error_str); bool res = Loader::LoadFile(boot_filename, &error_str);

30
src/citra/citra.h
View file

@ -1,29 +1,8 @@
/** // Copyright 2014 Citra Emulator Project
* Copyright (C) 2013 Citra Emulator // Licensed under GPLv2
* // Refer to the license.txt file included.
* @file citra.h
* @author ShizZy <shizzy247@gmail.com>
* @date 2013-09-04
* @brief Main entry point
*
* @section LICENSE
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details at
* http://www.gnu.org/copyleft/gpl.html
*
* Official project repository can be found at:
* http://code.google.com/p/gekko-gc-emu/
*/
#ifndef CITRA_CITRA_H #pragma once
#define CITRA_CITRA_H
#include "version.h" #include "version.h"
@ -32,4 +11,3 @@
#define APP_TITLE APP_NAME " " APP_VERSION #define APP_TITLE APP_NAME " " APP_VERSION
#define COPYRIGHT "Copyright (C) 2013 Citra Emulator" #define COPYRIGHT "Copyright (C) 2013 Citra Emulator"
#endif // CITRA_CITRA_H

38
src/citra/emu_window/emu_window_glfw.cpp
View file

@ -1,43 +1,13 @@
/** // Copyright 2014 Citra Emulator Project
* Copyright (C) 2013 Citra Emulator // Licensed under GPLv2
* // Refer to the license.txt file included.
* @file emu_window_glfw.cpp
* @author ShizZy <shizzy@6bit.net>
* @date 2013-09-04
* @brief Implementation implementation of EmuWindow class for GLFW
*
* @section LICENSE
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details at
* http://www.gnu.org/copyleft/gpl.html
*
* Official project repository can be found at:
* http://code.google.com/p/gekko-gc-emu/
*/
#include "common/common.h" #include "common/common.h"
#include "video_core/video_core.h" #include "video_core/video_core.h"
#include "citra/emu_window/emu_window_glfw.h" #include "citra/emu_window/emu_window_glfw.h"
static void OnKeyEvent(GLFWwindow* win, int key, int action) { static void OnKeyEvent(GLFWwindow* win, int key, int action) {
// EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win); // TODO(bunnei): ImplementMe
//input_common::GCController::GCButtonState state;
//if (action == GLFW_PRESS) {
// state = input_common::GCController::PRESSED;
//} else {
// state = input_common::GCController::RELEASED;
//}
// for (int channel = 0; channel < 4 && emuwin->controller_interface(); ++channel) {
// emuwin->controller_interface()->SetControllerStatus(channel, key, state);
// }
} }
static void OnWindowSizeEvent(GLFWwindow* win, int width, int height) { static void OnWindowSizeEvent(GLFWwindow* win, int width, int height) {

26
src/citra/emu_window/emu_window_glfw.h
View file

@ -1,26 +1,6 @@
/** // Copyright 2014 Citra Emulator Project
* Copyright (C) 2013 Citra Emulator // Licensed under GPLv2
* // Refer to the license.txt file included.
* @file emu_window_glfw.h
* @author ShizZy <shizzy@6bit.net>
* @date 2013-09-04
* @brief Implementation implementation of EmuWindow class for GLFW
*
* @section LICENSE
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details at
* http://www.gnu.org/copyleft/gpl.html
*
* Official project repository can be found at:
* http://code.google.com/p/gekko-gc-emu/
*/
#pragma once #pragma once