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 --- CMakeLists.txt | 4 +- README.md | 4 +- citra.sln | 64 ++++++++ citrus.sln | 64 -------- src/CMakeLists.txt | 4 +- 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 + src/citrus/CMakeLists.txt | 12 -- src/citrus/citrus.rc | Bin 3144 -> 0 bytes src/citrus/citrus.vcxproj | 214 -------------------------- src/citrus/citrus.vcxproj.filters | 25 --- src/citrus/resource.h | Bin 898 -> 0 bytes src/citrus/src/citrus.cpp | 90 ----------- src/citrus/src/citrus.h | 35 ----- src/citrus/src/emu_window/emu_window_glfw.cpp | 96 ------------ src/citrus/src/emu_window/emu_window_glfw.h | 56 ------- src/citrus/src/version.h | 6 - src/common/src/common_paths.h | 2 +- src/common/src/emu_window.h | 2 +- src/common/src/scm_rev.h | 4 +- src/common/src/version.cpp | 2 +- vsprops/base.props | 2 +- 30 files changed, 610 insertions(+), 610 deletions(-) create mode 100644 citra.sln delete mode 100644 citrus.sln 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 delete mode 100644 src/citrus/CMakeLists.txt delete mode 100644 src/citrus/citrus.rc delete mode 100644 src/citrus/citrus.vcxproj delete mode 100644 src/citrus/citrus.vcxproj.filters delete mode 100644 src/citrus/resource.h delete mode 100644 src/citrus/src/citrus.cpp delete mode 100644 src/citrus/src/citrus.h delete mode 100644 src/citrus/src/emu_window/emu_window_glfw.cpp delete mode 100644 src/citrus/src/emu_window/emu_window_glfw.h delete mode 100644 src/citrus/src/version.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 24ede00d2..80acc1cb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -project(citrus) +project(citra) # silence some spam add_definitions(-Wno-attributes) @@ -39,7 +39,7 @@ include_directories(${OPENGL_INCLUDE_DIR}) # internal includes include_directories(src/common/src) include_directories(src/core/src) -include_directories(src/citrus/src) +include_directories(src/citra/src) # process subdirectories if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4) diff --git a/README.md b/README.md index 1e6dcb5af..6271f93c5 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -citrus -====== +citra emulator +============== diff --git a/citra.sln b/citra.sln new file mode 100644 index 000000000..8d6deada2 --- /dev/null +++ b/citra.sln @@ -0,0 +1,64 @@ +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "src\common\common.vcxproj", "{DFE335FC-755D-4BAA-8452-94434F8A1EDB}" + ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "citra", "src\citra\citra.vcxproj", "{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}" + ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "src\core\core.vcxproj", "{8AEA7F29-3466-4786-A10D-6A4BD0610977}" + ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scm_rev_gen", "src\common\scm_rev_gen.vcxproj", "{69F00340-5C3D-449F-9A80-958435C6CF06}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|Win32.ActiveCfg = Debug|Win32 + {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|Win32.Build.0 = Debug|Win32 + {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|x64.ActiveCfg = Debug|x64 + {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|x64.Build.0 = Debug|x64 + {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|Win32.ActiveCfg = Release|Win32 + {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|Win32.Build.0 = Release|Win32 + {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|x64.ActiveCfg = Release|x64 + {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|x64.Build.0 = Release|x64 + {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|Win32.ActiveCfg = Debug|Win32 + {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|Win32.Build.0 = Debug|Win32 + {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|x64.ActiveCfg = Debug|x64 + {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|x64.Build.0 = Debug|x64 + {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|Win32.ActiveCfg = Release|Win32 + {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|Win32.Build.0 = Release|Win32 + {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|x64.ActiveCfg = Release|x64 + {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|x64.Build.0 = Release|x64 + {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|Win32.ActiveCfg = Debug|Win32 + {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|Win32.Build.0 = Debug|Win32 + {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|x64.ActiveCfg = Debug|x64 + {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|x64.Build.0 = Debug|x64 + {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|Win32.ActiveCfg = Release|Win32 + {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|Win32.Build.0 = Release|Win32 + {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|x64.ActiveCfg = Release|x64 + {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|x64.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.ActiveCfg = Debug|Win32 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.Build.0 = Debug|Win32 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.ActiveCfg = Release|Win32 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.Build.0 = Release|Win32 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/citrus.sln b/citrus.sln deleted file mode 100644 index b440746df..000000000 --- a/citrus.sln +++ /dev/null @@ -1,64 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "src\common\common.vcxproj", "{DFE335FC-755D-4BAA-8452-94434F8A1EDB}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "citrus", "src\citrus\citrus.vcxproj", "{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "src\core\core.vcxproj", "{8AEA7F29-3466-4786-A10D-6A4BD0610977}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scm_rev_gen", "src\common\scm_rev_gen.vcxproj", "{69F00340-5C3D-449F-9A80-958435C6CF06}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|Win32.ActiveCfg = Debug|Win32 - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|Win32.Build.0 = Debug|Win32 - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|x64.ActiveCfg = Debug|x64 - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|x64.Build.0 = Debug|x64 - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|Win32.ActiveCfg = Release|Win32 - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|Win32.Build.0 = Release|Win32 - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|x64.ActiveCfg = Release|x64 - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|x64.Build.0 = Release|x64 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|Win32.ActiveCfg = Debug|Win32 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|Win32.Build.0 = Debug|Win32 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|x64.ActiveCfg = Debug|x64 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|x64.Build.0 = Debug|x64 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|Win32.ActiveCfg = Release|Win32 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|Win32.Build.0 = Release|Win32 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|x64.ActiveCfg = Release|x64 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|x64.Build.0 = Release|x64 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|Win32.ActiveCfg = Debug|Win32 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|Win32.Build.0 = Debug|Win32 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|x64.ActiveCfg = Debug|x64 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|x64.Build.0 = Debug|x64 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|Win32.ActiveCfg = Release|Win32 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|Win32.Build.0 = Release|Win32 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|x64.ActiveCfg = Release|x64 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|x64.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.ActiveCfg = Debug|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.Build.0 = Debug|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.ActiveCfg = Release|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.Build.0 = Release|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 967288000..f988bf34e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ add_subdirectory(common) add_subdirectory(core) -add_subdirectory(citrus) +add_subdirectory(citra) if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4) - #add_subdirectory(citrus_qt) + #add_subdirectory(citra_qt) endif() 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_ diff --git a/src/citrus/CMakeLists.txt b/src/citrus/CMakeLists.txt deleted file mode 100644 index 6858a5891..000000000 --- a/src/citrus/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -set(SRCS src/citrus.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(citrus ${SRCS}) -target_link_libraries(citrus core common ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} GLEW rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) - -#install(TARGETS citrus RUNTIME DESTINATION ${bindir}) diff --git a/src/citrus/citrus.rc b/src/citrus/citrus.rc deleted file mode 100644 index dd5241bdf..000000000 Binary files a/src/citrus/citrus.rc and /dev/null differ diff --git a/src/citrus/citrus.vcxproj b/src/citrus/citrus.vcxproj deleted file mode 100644 index 1243d14e5..000000000 --- a/src/citrus/citrus.vcxproj +++ /dev/null @@ -1,214 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F} - Win32Proj - emu_win32 - citrus - - - - 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/citrus/citrus.vcxproj.filters b/src/citrus/citrus.vcxproj.filters deleted file mode 100644 index 567467ac9..000000000 --- a/src/citrus/citrus.vcxproj.filters +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - emu_window - - - - - - - - emu_window - - - - - - - - {e3161526-9f53-4670-8dae-2be81ff01bc2} - - - \ No newline at end of file diff --git a/src/citrus/resource.h b/src/citrus/resource.h deleted file mode 100644 index 0d42c8a8a..000000000 Binary files a/src/citrus/resource.h and /dev/null differ diff --git a/src/citrus/src/citrus.cpp b/src/citrus/src/citrus.cpp deleted file mode 100644 index faeacc290..000000000 --- a/src/citrus/src/citrus.cpp +++ /dev/null @@ -1,90 +0,0 @@ -/** - * Copyright (C) 2013 Citrus Emulator - * - * @file citrus.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 "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 0f4d7dc3f..000000000 --- a/src/citrus/src/citrus.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright (C) 2013 Citrus Emulator - * - * @file citrus.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 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 381f1d9a7..000000000 --- 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 - * @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 11d832b9a..000000000 --- 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 - * @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 -#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 // CITRUS_EMUWINDOW_GLFW_ diff --git a/src/citrus/src/version.h b/src/citrus/src/version.h deleted file mode 100644 index 07b88c641..000000000 --- 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_ diff --git a/src/common/src/common_paths.h b/src/common/src/common_paths.h index 1ad887a79..30bd4b742 100644 --- a/src/common/src/common_paths.h +++ b/src/common/src/common_paths.h @@ -26,7 +26,7 @@ #ifdef USER_DIR #define EMU_DATA_DIR USER_DIR #else - #define EMU_DATA_DIR ".citrus" + #define EMU_DATA_DIR ".emu" #endif #endif diff --git a/src/common/src/emu_window.h b/src/common/src/emu_window.h index 12b475934..2427b5b6a 100644 --- a/src/common/src/emu_window.h +++ b/src/common/src/emu_window.h @@ -81,7 +81,7 @@ public: protected: EmuWindow() : client_area_width_(640), client_area_height_(480) { char window_title[255]; - sprintf(window_title, "citrus [%s|%s] - %s", + sprintf(window_title, "emu [%s|%s] - %s", "null-cpu", "null-renderer", __DATE__); diff --git a/src/common/src/scm_rev.h b/src/common/src/scm_rev.h index 05ad76964..69962c58e 100644 --- a/src/common/src/scm_rev.h +++ b/src/common/src/scm_rev.h @@ -1,4 +1,4 @@ -#define SCM_REV_STR "bfa6493324336066a1ef9d04f336faacae57d9f3" -#define SCM_DESC_STR "bfa6493" +#define SCM_REV_STR "a7b06698ff012aa7b1094414e796ffae1ca1eb4d" +#define SCM_DESC_STR "a7b0669" #define SCM_BRANCH_STR "master" #define SCM_IS_MASTER 1 diff --git a/src/common/src/version.cpp b/src/common/src/version.cpp index f4010b6df..25e99b21a 100644 --- a/src/common/src/version.cpp +++ b/src/common/src/version.cpp @@ -13,7 +13,7 @@ #define BUILD_TYPE_STR "" #endif -const char *scm_rev_str = "citrus " +const char *scm_rev_str = "emu " #if !SCM_IS_MASTER "[" SCM_BRANCH_STR "] " #endif diff --git a/vsprops/base.props b/vsprops/base.props index e0f1eb51e..0f59b512b 100644 --- a/vsprops/base.props +++ b/vsprops/base.props @@ -12,7 +12,7 @@ 16Bytes true true - $(SolutionDir)src\common\src;$(SolutionDir)src\core\src;$(SolutionDir)src\citrus\src;%(AdditionalIncludeDirectories) + $(SolutionDir)src\common\src;$(SolutionDir)src\core\src;$(SolutionDir)src\citra\src;%(AdditionalIncludeDirectories) false -- cgit v1.2.3