various fixes to be able to build project

8 files changed, 112 insertions, 151 deletions

diff --git a/src/akiru/akiru.rc b/src/akiru/akiru.rc
index 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
diff --git a/src/common/src/emu_window.h b/src/common/src/emu_window.h
index 08f7d4766..56ff94819 100644
--- a/src/common/src/emu_window.h
+++ b/src/common/src/emu_window.h
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2005-2012 Gekko Emulator
  *
- * @file    emuwindow.h
+ * @file    emu_window.h
  * @author  Neobrain
  * @date    2012-06-01
  * @brief   Interface for implementing an emulator window manager
@@ -26,12 +26,11 @@
 #define CORE_EMUWINDOW_H_
 
 #include "common.h"
-#include "config.h"
 
-namespace input_common
-{
-class KeyboardInput;
-}
+//namespace input_common
+//{
+//class KeyboardInput;
+//}
 
 // Abstraction class used to provide an interface between emulation code and the frontend (e.g. SDL, 
 //  QGLWidget, GLFW, etc...)
@@ -62,10 +61,10 @@ public:
      * @brief Called from KeyboardInput constructor to notify EmuWindow about its presence
      * @param controller_interface Pointer to a running KeyboardInput interface
      */
-    void set_controller_interface(input_common::KeyboardInput* controller_interface) { 
-        controller_interface_ = controller_interface;
-    }
-    input_common::KeyboardInput* controller_interface() { return controller_interface_; }
+    //void set_controller_interface(input_common::KeyboardInput* controller_interface) { 
+    //    controller_interface_ = controller_interface;
+    //}
+    //input_common::KeyboardInput* controller_interface() { return controller_interface_; }
 
     Config config() { return config_; }
     void set_config(Config val) { config_ = val; }
@@ -80,11 +79,11 @@ public:
     void set_window_title(std::string val) { window_title_ = val; }
 
 protected:
-    EmuWindow() : controller_interface_(NULL), client_area_width_(640), client_area_height_(480) {
+    EmuWindow() : client_area_width_(640), client_area_height_(480) {
         char window_title[255];
-        sprintf(window_title, "gekko [%s|%s] - %s", 
-            common::g_config->CPUCoreTypeToString(common::g_config->powerpc_core()).c_str(), 
-            common::g_config->RenderTypeToString(common::g_config->current_renderer()).c_str(), 
+        sprintf(window_title, "akiru [%s|%s] - %s", 
+            "null-cpu", 
+            "null-renderer", 
             __DATE__);
         window_title_ = window_title;
     }
@@ -98,9 +97,6 @@ protected:
 private:
     Config config_;         ///< Internal configuration
 
-    input_common::KeyboardInput* controller_interface_;
-
-    DISALLOW_COPY_AND_ASSIGN(EmuWindow);
 };
 
 #endif // CORE_EMUWINDOW_H_
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index c976d292e..22fc96fe2 100644
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -44,31 +44,31 @@
   </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\Optimization_Debug.props" />
-    <Import Project="..\..\vsprops\Externals.props" />
+    <Import Project="..\..\vsprops\base.props" />
+    <Import Project="..\..\vsprops\code_generation_debug.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\Optimization_Debug.props" />
-    <Import Project="..\..\vsprops\Externals.props" />
+    <Import Project="..\..\vsprops\base.props" />
+    <Import Project="..\..\vsprops\code_generation_debug.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\Optimization_Release.props" />
-    <Import Project="..\..\vsprops\Externals.props" />
+    <Import Project="..\..\vsprops\base.props" />
+    <Import Project="..\..\vsprops\code_generation_release.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\Optimization_Release.props" />
-    <Import Project="..\..\vsprops\Externals.props" />
+    <Import Project="..\..\vsprops\base.props" />
+    <Import Project="..\..\vsprops\code_generation_release.props" />
+    <Import Project="..\..\vsprops\optimization_release.props" />
+    <Import Project="..\..\vsprops\externals.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@@ -180,6 +180,9 @@
       <Project>{dfe335fc-755d-4baa-8452-94434f8a1edb}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\core.cpp" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>