summaryrefslogtreecommitdiff
path: root/src/citra/citra.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2014-04-08 20:25:53 -0400
committerGravatar bunnei2014-04-08 20:25:53 -0400
commitad4fffca0ddadc67f43173d20069295920dc66b4 (patch)
treef99f597d9f34309bec103d4c403328a86b3a024c /src/citra/citra.cpp
parentremoved duplicate license file (diff)
downloadyuzu-ad4fffca0ddadc67f43173d20069295920dc66b4.tar.gz
yuzu-ad4fffca0ddadc67f43173d20069295920dc66b4.tar.xz
yuzu-ad4fffca0ddadc67f43173d20069295920dc66b4.zip
fixed license headers in citra project
Diffstat (limited to 'src/citra/citra.cpp')
-rw-r--r--src/citra/citra.cpp38
1 files changed, 5 insertions, 33 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 37ea97403..d55b97393 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -1,26 +1,6 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2013 citra Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file citra.cpp
5 * @author ShizZy <shizzy247@gmail.com>
6 * @date 2013-09-04
7 * @brief Main entry point
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#include "common/common.h" 5#include "common/common.h"
26#include "common/log_manager.h" 6#include "common/log_manager.h"
@@ -34,17 +14,9 @@
34 14
35#include "citra/citra.h" 15#include "citra/citra.h"
36 16
37#define E_ERR -1
38
39//#define PLAY_FIFO_RECORDING
40
41/// Application entry point 17/// Application entry point
42int __cdecl main(int argc, char **argv) { 18int __cdecl main(int argc, char **argv) {
43 //u32 tight_loop; 19 std::string program_dir = File::GetCurrentDir();
44
45 printf("citra starting...\n");
46
47 std::string program_dir = File::GetCurrentDir();
48 20
49 LogManager::Init(); 21 LogManager::Init();
50 22
@@ -52,7 +24,7 @@ int __cdecl main(int argc, char **argv) {
52 24
53 System::Init(emu_window); 25 System::Init(emu_window);
54 26
55 std::string boot_filename = "C:\\Users\\eric\\Desktop\\3ds\\homebrew\\Mandelbrot3DS.elf"; 27 std::string boot_filename = "homebrew.elf";
56 std::string error_str; 28 std::string error_str;
57 29
58 bool res = Loader::LoadFile(boot_filename, &error_str); 30 bool res = Loader::LoadFile(boot_filename, &error_str);