From 8bb0c457bca110ca80fd3d09e78a794600a7221a Mon Sep 17 00:00:00 2001
From: ShizZy
Date: Thu, 26 Sep 2013 17:34:48 -0400
Subject: renamed from citrus to citra
---
src/citra/CMakeLists.txt | 12 ++
src/citra/citra.rc | Bin 0 -> 3144 bytes
src/citra/citra.vcxproj | 214 +++++++++++++++++++++++++++
src/citra/citra.vcxproj.filters | 25 ++++
src/citra/resource.h | Bin 0 -> 898 bytes
src/citra/src/citra.cpp | 90 +++++++++++
src/citra/src/citra.h | 35 +++++
src/citra/src/emu_window/emu_window_glfw.cpp | 96 ++++++++++++
src/citra/src/emu_window/emu_window_glfw.h | 56 +++++++
src/citra/src/version.h | 6 +
10 files changed, 534 insertions(+)
create mode 100644 src/citra/CMakeLists.txt
create mode 100644 src/citra/citra.rc
create mode 100644 src/citra/citra.vcxproj
create mode 100644 src/citra/citra.vcxproj.filters
create mode 100644 src/citra/resource.h
create mode 100644 src/citra/src/citra.cpp
create mode 100644 src/citra/src/citra.h
create mode 100644 src/citra/src/emu_window/emu_window_glfw.cpp
create mode 100644 src/citra/src/emu_window/emu_window_glfw.h
create mode 100644 src/citra/src/version.h
(limited to 'src/citra')
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt
new file mode 100644
index 000000000..3a76b5045
--- /dev/null
+++ b/src/citra/CMakeLists.txt
@@ -0,0 +1,12 @@
+set(SRCS src/citra.cpp
+ src/emuwindow/emuwindow_glfw.cpp)
+
+# NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable)
+if (NOT X11_xf86vmode_LIB)
+ set(X11_xv86vmode_LIB Xxf86vm)
+endif()
+
+add_executable(citra ${SRCS})
+target_link_libraries(citra core common ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} GLEW rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB})
+
+#install(TARGETS citra RUNTIME DESTINATION ${bindir})
diff --git a/src/citra/citra.rc b/src/citra/citra.rc
new file mode 100644
index 000000000..dd5241bdf
Binary files /dev/null and b/src/citra/citra.rc differ
diff --git a/src/citra/citra.vcxproj b/src/citra/citra.vcxproj
new file mode 100644
index 000000000..2645d3c3c
--- /dev/null
+++ b/src/citra/citra.vcxproj
@@ -0,0 +1,214 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}
+ Win32Proj
+ emu_win32
+ citra
+
+
+
+ Application
+ true
+
+
+ Application
+ true
+
+
+ Application
+ false
+
+
+ Application
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ msvcrtd.lib;msvcrt.lib
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ libcmt.lib
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {dfe335fc-755d-4baa-8452-94434f8a1edb}
+ true
+ true
+ false
+ true
+ false
+
+
+ {8aea7f29-3466-4786-a10d-6a4bd0610977}
+ true
+ true
+ false
+ true
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/citra/citra.vcxproj.filters b/src/citra/citra.vcxproj.filters
new file mode 100644
index 000000000..510e07b53
--- /dev/null
+++ b/src/citra/citra.vcxproj.filters
@@ -0,0 +1,25 @@
+
+
+
+
+
+ emu_window
+
+
+
+
+
+
+
+ emu_window
+
+
+
+
+
+
+
+ {e3161526-9f53-4670-8dae-2be81ff01bc2}
+
+
+
\ No newline at end of file
diff --git a/src/citra/resource.h b/src/citra/resource.h
new file mode 100644
index 000000000..0d42c8a8a
Binary files /dev/null and b/src/citra/resource.h differ
diff --git a/src/citra/src/citra.cpp b/src/citra/src/citra.cpp
new file mode 100644
index 000000000..eb0290687
--- /dev/null
+++ b/src/citra/src/citra.cpp
@@ -0,0 +1,90 @@
+/**
+ * Copyright (C) 2013 citra Emulator
+ *
+ * @file citra.cpp
+ * @author ShizZy
+ * @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 "citra.h"
+
+//#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();
+
+ 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/citra/src/citra.h b/src/citra/src/citra.h
new file mode 100644
index 000000000..b3a07c005
--- /dev/null
+++ b/src/citra/src/citra.h
@@ -0,0 +1,35 @@
+/**
+ * Copyright (C) 2013 Citra Emulator
+ *
+ * @file citra.h
+ * @author ShizZy
+ * @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
+#define CITRA_CITRA_H
+
+#include "version.h"
+
+#define APP_NAME "citra"
+#define APP_VERSION "0.01-" VERSION
+#define APP_TITLE APP_NAME " " APP_VERSION
+#define COPYRIGHT "Copyright (C) 2013 Citra Emulator"
+
+#endif // CITRA_CITRA_H
diff --git a/src/citra/src/emu_window/emu_window_glfw.cpp b/src/citra/src/emu_window/emu_window_glfw.cpp
new file mode 100644
index 000000000..8edc745b7
--- /dev/null
+++ b/src/citra/src/emu_window/emu_window_glfw.cpp
@@ -0,0 +1,96 @@
+/**
+ * Copyright (C) 2013 Citra Emulator
+ *
+ * @file emu_window_glfw.cpp
+ * @author ShizZy
+ * @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, "citra", 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/citra/src/emu_window/emu_window_glfw.h b/src/citra/src/emu_window/emu_window_glfw.h
new file mode 100644
index 000000000..0339b5d68
--- /dev/null
+++ b/src/citra/src/emu_window/emu_window_glfw.h
@@ -0,0 +1,56 @@
+/**
+ * Copyright (C) 2013 Citra Emulator
+ *
+ * @file emu_window_glfw.h
+ * @author ShizZy
+ * @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 CITRA_EMUWINDOW_GLFW_
+#define CITRA_EMUWINDOW_GLFW_
+
+#include
+#include
+
+#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 // CITRA_EMUWINDOW_GLFW_
diff --git a/src/citra/src/version.h b/src/citra/src/version.h
new file mode 100644
index 000000000..07b88c641
--- /dev/null
+++ b/src/citra/src/version.h
@@ -0,0 +1,6 @@
+// GENERATED - Do not edit!
+#ifndef VERSION_H_
+#define VERSION_H_
+#define __BUILD__ "122"
+#define VERSION __BUILD__
+#endif // VERSION_H_
--
cgit v1.2.3