diff options
Diffstat (limited to 'src/akiru')
| -rw-r--r-- | src/akiru/akiru.rc | bin | 3284 -> 3144 bytes | |||
| -rw-r--r-- | src/akiru/akiru.vcxproj | 44 | ||||
| -rw-r--r-- | src/akiru/akiru.vcxproj.filters | 19 | ||||
| -rw-r--r-- | src/akiru/src/akiru.cpp | 135 | ||||
| -rw-r--r-- | src/akiru/src/emuwindow/emu_window_glfw.cpp (renamed from src/akiru/src/emuwindow/emuwindow_glfw.cpp) | 0 | ||||
| -rw-r--r-- | src/akiru/src/emuwindow/emu_window_glfw.h (renamed from src/akiru/src/emuwindow/emuwindow_glfw.h) | 0 |
6 files changed, 80 insertions, 118 deletions
diff --git a/src/akiru/akiru.rc b/src/akiru/akiru.rc Binary files differindex db4fc80b9..dd5241bdf 100644 --- a/src/akiru/akiru.rc +++ b/src/akiru/akiru.rc diff --git a/src/akiru/akiru.vcxproj b/src/akiru/akiru.vcxproj index f5ab86719..f74948853 100644 --- a/src/akiru/akiru.vcxproj +++ b/src/akiru/akiru.vcxproj @@ -46,35 +46,35 @@ </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\vsprops\Base.props" /> - <Import Project="..\..\vsprops\CodeGen_Debug.props" /> - <Import Project="..\..\vsprops\App.props" /> - <Import Project="..\..\vsprops\Optimization_Debug.props" /> - <Import Project="..\..\vsprops\Externals.props" /> + <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\code_generation_debug.props" /> + <Import Project="..\..\vsprops\app.props" /> + <Import Project="..\..\vsprops\optimization_debug.props" /> + <Import Project="..\..\vsprops\externals.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\vsprops\Base.props" /> - <Import Project="..\..\vsprops\CodeGen_Debug.props" /> - <Import Project="..\..\vsprops\App.props" /> - <Import Project="..\..\vsprops\Optimization_Debug.props" /> - <Import Project="..\..\vsprops\Externals.props" /> + <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\code_generation_debug.props" /> + <Import Project="..\..\vsprops\app.props" /> + <Import Project="..\..\vsprops\optimization_debug.props" /> + <Import Project="..\..\vsprops\externals.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\vsprops\Base.props" /> - <Import Project="..\..\vsprops\CodeGen_Release.props" /> - <Import Project="..\..\vsprops\App.props" /> - <Import Project="..\..\vsprops\Optimization_Release.props" /> - <Import Project="..\..\vsprops\Externals.props" /> + <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\code_generation_release.props" /> + <Import Project="..\..\vsprops\app.props" /> + <Import Project="..\..\vsprops\optimization_release.props" /> + <Import Project="..\..\vsprops\externals.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\vsprops\Base.props" /> - <Import Project="..\..\vsprops\CodeGen_Release.props" /> - <Import Project="..\..\vsprops\App.props" /> - <Import Project="..\..\vsprops\Optimization_Release.props" /> - <Import Project="..\..\vsprops\Externals.props" /> + <Import Project="..\..\vsprops\base.props" /> + <Import Project="..\..\vsprops\code_generation_release.props" /> + <Import Project="..\..\vsprops\app.props" /> + <Import Project="..\..\vsprops\optimization_release.props" /> + <Import Project="..\..\vsprops\externals.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> @@ -190,13 +190,13 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <ClCompile Include="src\emuwindow\emuwindow_glfw.cpp" /> <ClCompile Include="src\akiru.cpp" /> + <ClCompile Include="src\emu_window\emu_window_glfw.cpp" /> </ItemGroup> <ItemGroup> <ClInclude Include="resource.h" /> - <ClInclude Include="src\emuwindow\emuwindow_glfw.h" /> <ClInclude Include="src\akiru.h" /> + <ClInclude Include="src\emu_window\emu_window_glfw.h" /> <ClInclude Include="src\version.h" /> </ItemGroup> <ItemGroup> diff --git a/src/akiru/akiru.vcxproj.filters b/src/akiru/akiru.vcxproj.filters index 2fc1128af..a0cff2548 100644 --- a/src/akiru/akiru.vcxproj.filters +++ b/src/akiru/akiru.vcxproj.filters @@ -2,32 +2,23 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <ClCompile Include="src\akiru.cpp" /> - <ClCompile Include="src\emuwindow\emuwindow_glfw.cpp"> - <Filter>emuwindow</Filter> - </ClCompile> - <ClCompile Include="src\emuwindow\emuwindow_sdl.cpp"> - <Filter>emuwindow</Filter> + <ClCompile Include="src\emu_window\emu_window_glfw.cpp"> + <Filter>emu_window</Filter> </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="resource.h" /> <ClInclude Include="src\version.h" /> - <ClInclude Include="src\emuwindow\emuwindow_glfw.h"> - <Filter>emuwindow</Filter> - </ClInclude> <ClInclude Include="src\akiru.h" /> - <ClInclude Include="src\emuwindow\emuwindow_sdl.h"> - <Filter>emuwindow</Filter> + <ClInclude Include="src\emu_window\emu_window_glfw.h"> + <Filter>emu_window</Filter> </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="akiru.rc" /> </ItemGroup> <ItemGroup> - <None Include="res\icon3_48x48.ico" /> - </ItemGroup> - <ItemGroup> - <Filter Include="emuwindow"> + <Filter Include="emu_window"> <UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier> </Filter> </ItemGroup> diff --git a/src/akiru/src/akiru.cpp b/src/akiru/src/akiru.cpp index 0d15c5b20..bb69cf1b1 100644 --- a/src/akiru/src/akiru.cpp +++ b/src/akiru/src/akiru.cpp @@ -1,9 +1,9 @@ -/*! +/** * Copyright (C) 2013 Akiru Emulator * - * @file akiry.cpp + * @file akiru.cpp * @author ShizZy <shizzy247@gmail.com> - * @date 2012-02-11 + * @date 2013-09-04 * @brief Main entry point * * @section LICENSE @@ -23,102 +23,73 @@ */ #include "common.h" -#include "platform.h" -#if EMU_PLATFORM == PLATFORM_LINUX -#include <unistd.h> -#endif +//#if EMU_PLATFORM == PLATFORM_LINUX +//#include <unistd.h> +//#endif -#include "config.h" -#include "xml.h" -#include "x86_utils.h" - -//#include "core.h" -//#include "dvd/loader.h" -//#include "powerpc/cpu_core.h" -//#include "hw/hw.h" -//#include "video_core.h" - -#include "emuwindow/emuwindow_glfw.h" +#include "emu_window/emu_window_glfw.h" #include "akiru.h" -//////////////////////////////////////////////////////////////////////////////////////////////////// -// This is needed to fix SDL in certain build environments -#ifdef main -#undef main -#endif - //#define PLAY_FIFO_RECORDING /// Application entry point int __cdecl main(int argc, char **argv) { u32 tight_loop; - LOG_NOTICE(TMASTER, APP_NAME " starting...\n"); + printf("akiru starting...\n"); - char program_dir[MAX_PATH]; - _getcwd(program_dir, MAX_PATH-1); - size_t cwd_len = strlen(program_dir); - program_dir[cwd_len] = '/'; - program_dir[cwd_len+1] = '\0'; + //char program_dir[MAX_PATH]; + //_getcwd(program_dir, MAX_PATH-1); + //size_t cwd_len = strlen(program_dir); + //program_dir[cwd_len] = '/'; + //program_dir[cwd_len+1] = '\0'; - common::ConfigManager config_manager; - config_manager.set_program_dir(program_dir, MAX_PATH); - config_manager.ReloadConfig(NULL); - core::SetConfigManager(&config_manager); + //common::ConfigManager config_manager; + //config_manager.set_program_dir(program_dir, MAX_PATH); + //config_manager.ReloadConfig(NULL); + //core::SetConfigManager(&config_manager); EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; - if (E_OK != core::Init(emu_window)) { - LOG_ERROR(TMASTER, "core initialization failed, exiting..."); - core::Kill(); - exit(1); - } - -#ifndef PLAY_FIFO_RECORDING - // 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(); -#else - // load fifo log and replay it - - // TODO: Restructure initialization process - Fix Flipper_Open being called from dvd loaders (wtf?) - Flipper_Open(); - video_core::Start(emu_window); - core::SetState(core::SYS_RUNNING); - - fifo_player::FPFile file; - fifo_player::Load("/home/tony/20_frames.gff", file); - fifo_player::PlayFile(file); + //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) { + } - // TODO: Wait for video core to finish - PlayFile should handle this - while (1); -#endif delete emu_window; - return E_OK; + return 0; } diff --git a/src/akiru/src/emuwindow/emuwindow_glfw.cpp b/src/akiru/src/emuwindow/emu_window_glfw.cpp index 884c10ad0..884c10ad0 100644 --- a/src/akiru/src/emuwindow/emuwindow_glfw.cpp +++ b/src/akiru/src/emuwindow/emu_window_glfw.cpp diff --git a/src/akiru/src/emuwindow/emuwindow_glfw.h b/src/akiru/src/emuwindow/emu_window_glfw.h index 1256cabe4..1256cabe4 100644 --- a/src/akiru/src/emuwindow/emuwindow_glfw.h +++ b/src/akiru/src/emuwindow/emu_window_glfw.h |