renamed from citrus to citra

5 files changed, 0 insertions, 283 deletions

diff --git a/src/citrus/src/citrus.cpp b/src/citrus/src/citrus.cpp
deleted file mode 100644
index faeacc29..00000000
--- a/src/citrus/src/citrus.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright (C) 2013 Citrus Emulator
- *
- * @file    citrus.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.h"
-#include "log_manager.h"
-#include "file_util.h"
-
-#include "core.h"
-
-#include "emu_window/emu_window_glfw.h"
-
-#include "citrus.h"
-
-//#define PLAY_FIFO_RECORDING
-
-/// Application entry point
-int __cdecl main(int argc, char **argv) {
-    //u32 tight_loop;
-
-    printf("citrus starting...\n");
-
-	std::string program_dir = File::GetCurrentDir();
-
-	LogManager::Init();
-
-    EmuWindow_GLFW* emu_window = new EmuWindow_GLFW;
-
-	Core::Init(emu_window);
-
-    //if (E_OK != core::Init(emu_window)) {
-    //    LOG_ERROR(TMASTER, "core initialization failed, exiting...");
-    //    core::Kill();
-    //    exit(1);
-    //}
-
-    //// Load a game or die...
-    //if (E_OK == dvd::LoadBootableFile(common::g_config->default_boot_file())) {
-    //    if (common::g_config->enable_auto_boot()) {
-    //        core::Start();
-    //    } else {
-    //        LOG_ERROR(TMASTER, "Autoboot required in no-GUI mode... Exiting!\n");
-    //    }
-    //} else {
-    //    LOG_ERROR(TMASTER, "Failed to load a bootable file... Exiting!\n");
-    //    exit(E_ERR);
-    //}
-    //// run the game
-    //while(core::SYS_DIE != core::g_state) {
-    //    if (core::SYS_RUNNING == core::g_state) {
-    //        if(!(cpu->is_on)) {
-    //            cpu->Start(); // Initialize and start CPU.
-    //        } else {
-    //            for(tight_loop = 0; tight_loop < 10000; ++tight_loop) {
-    //                cpu->execStep();
-    //            }
-    //        }
-    //    } else if (core::SYS_HALTED == core::g_state) {
-    //        core::Stop();
-    //    }
-    //}
-    //core::Kill();
-
-	while (1) {
-	}
-
-    //delete emu_window;
-
-	return 0;
-}
diff --git a/src/citrus/src/citrus.h b/src/citrus/src/citrus.h
deleted file mode 100644
index 0f4d7dc3..00000000
--- a/src/citrus/src/citrus.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (C) 2013 Citrus Emulator
- *
- * @file    citrus.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 CITRUS_CITRUS_H_
-#define CITRUS_CITRUS_H_
-
-#include "version.h"
-
-#define APP_NAME        "citrus"
-#define APP_VERSION     "0.01-" VERSION
-#define APP_TITLE       APP_NAME " " APP_VERSION
-#define	COPYRIGHT       "Copyright (C) 2013 Citrus Team"
-
-#endif // CITRUS_CITRUS_H_
diff --git a/src/citrus/src/emu_window/emu_window_glfw.cpp b/src/citrus/src/emu_window/emu_window_glfw.cpp
deleted file mode 100644
index 381f1d9a..00000000
--- a/src/citrus/src/emu_window/emu_window_glfw.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Copyright (C) 2013 Citrus Emulator
- *
- * @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.h"
-#include "emu_window_glfw.h"
-
-static void OnKeyEvent(GLFWwindow* win, int key, int action) {
- //   EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win);
-	//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) {
-    EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win);
-    emuwin->set_client_area_width(width);
-    emuwin->set_client_area_height(height);
-}
-
-/// EmuWindow_GLFW constructor
-EmuWindow_GLFW::EmuWindow_GLFW() {
-    // Initialize the window
-    if(glfwInit() != GL_TRUE) {
-        printf("Failed to initialize GLFW! Exiting...");
-        exit(1);
-    }
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
-    render_window_ = glfwCreateWindow(640, 480, "citrus", NULL, NULL);
-
-    // Setup callbacks
-    glfwSetWindowUserPointer(render_window_, this);
-    //glfwSetKeyCallback(render_window_, OnKeyEvent);
-    //glfwSetWindowSizeCallback(render_window_, OnWindowSizeEvent);
-
-    DoneCurrent();
-}
-
-/// EmuWindow_GLFW destructor
-EmuWindow_GLFW::~EmuWindow_GLFW() {
-    glfwTerminate();
-}
-
-/// Swap buffers to display the next frame
-void EmuWindow_GLFW::SwapBuffers() {
-    glfwSwapBuffers(render_window_);
-}
-
-/// Polls window events
-void EmuWindow_GLFW::PollEvents() {
-    // TODO(ShizZy): Does this belong here? This is a reasonable place to update the window title
-    //  from the main thread, but this should probably be in an event handler...
-    static char title[128];
-    sprintf(title, "%s (FPS: %02.02f)", window_title_.c_str(), 0.0f);
-    glfwSetWindowTitle(render_window_, title);
-
-    glfwPollEvents();
-}
-
-/// Makes the GLFW OpenGL context current for the caller thread
-void EmuWindow_GLFW::MakeCurrent() {
-    glfwMakeContextCurrent(render_window_);
-}
-
-/// Releases (dunno if this is the "right" word) the GLFW context from the caller thread
-void EmuWindow_GLFW::DoneCurrent() {
-    glfwMakeContextCurrent(NULL);
-}
diff --git a/src/citrus/src/emu_window/emu_window_glfw.h b/src/citrus/src/emu_window/emu_window_glfw.h
deleted file mode 100644
index 11d832b9..00000000
--- a/src/citrus/src/emu_window/emu_window_glfw.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright (C) 2013 Citrus Emulator
- *
- * @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/
- */
-
-#ifndef CITRUS_EMUWINDOW_GLFW_
-#define CITRUS_EMUWINDOW_GLFW_
-
-#include <GL/glew.h>
-#include <GLFW/glfw3.h>
-
-#include "emu_window.h"
-
-class EmuWindow_GLFW : public EmuWindow {
-public:
-    EmuWindow_GLFW();
-    ~EmuWindow_GLFW();
-
-    /// Swap buffers to display the next frame
-    void SwapBuffers();
-
-	/// Polls window events
-	void PollEvents();
-
-    /// Makes the graphics context current for the caller thread
-    void MakeCurrent();
-    
-    /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread
-    void DoneCurrent();
-
-	GLFWwindow* render_window_;      ///< Internal GLFW render window
-
-private:
-
-};
-
-#endif // CITRUS_EMUWINDOW_GLFW_
diff --git a/src/citrus/src/version.h b/src/citrus/src/version.h
deleted file mode 100644
index 07b88c64..00000000
--- a/src/citrus/src/version.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// GENERATED - Do not edit!
-#ifndef VERSION_H_
-#define VERSION_H_
-#define __BUILD__ "122"
-#define VERSION __BUILD__
-#endif // VERSION_H_