diff options
author | bunnei <ericbunnie@gmail.com> | 2014-04-09 02:25:53 +0200 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-04-09 02:25:53 +0200 |
commit | ad4fffca0ddadc67f43173d20069295920dc66b4 (patch) | |
tree | f99f597d9f34309bec103d4c403328a86b3a024c /src/citra/citra.cpp | |
parent | removed duplicate license file (diff) | |
download | yuzu-ad4fffca0ddadc67f43173d20069295920dc66b4.tar yuzu-ad4fffca0ddadc67f43173d20069295920dc66b4.tar.gz yuzu-ad4fffca0ddadc67f43173d20069295920dc66b4.tar.bz2 yuzu-ad4fffca0ddadc67f43173d20069295920dc66b4.tar.lz yuzu-ad4fffca0ddadc67f43173d20069295920dc66b4.tar.xz yuzu-ad4fffca0ddadc67f43173d20069295920dc66b4.tar.zst yuzu-ad4fffca0ddadc67f43173d20069295920dc66b4.zip |
Diffstat (limited to 'src/citra/citra.cpp')
-rw-r--r-- | src/citra/citra.cpp | 38 |
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 @@ -/** - * Copyright (C) 2013 citra Emulator - * - * @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/ - */ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include "common/common.h" #include "common/log_manager.h" @@ -34,17 +14,9 @@ #include "citra/citra.h" -#define E_ERR -1 - -//#define PLAY_FIFO_RECORDING - /// Application entry point 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(); @@ -52,7 +24,7 @@ int __cdecl main(int argc, char **argv) { 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; bool res = Loader::LoadFile(boot_filename, &error_str); |