fixed project includes to use new directory structure
This commit is contained in:
parent
63e46abdb8
commit
de0a034a84
95 changed files with 634 additions and 613 deletions
|
|
@ -22,17 +22,17 @@
|
|||
* http://code.google.com/p/gekko-gc-emu/
|
||||
*/
|
||||
|
||||
#include "common.h"
|
||||
#include "log_manager.h"
|
||||
#include "file_util.h"
|
||||
#include "common/common.h"
|
||||
#include "common/log_manager.h"
|
||||
#include "common/file_util.h"
|
||||
|
||||
#include "system.h"
|
||||
#include "core.h"
|
||||
#include "loader.h"
|
||||
#include "core/system.h"
|
||||
#include "core/core.h"
|
||||
#include "core/loader.h"
|
||||
|
||||
#include "emu_window/emu_window_glfw.h"
|
||||
#include "citra/emu_window/emu_window_glfw.h"
|
||||
|
||||
#include "citra.h"
|
||||
#include "citra/citra.h"
|
||||
|
||||
#define E_ERR -1
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ int __cdecl main(int argc, char **argv) {
|
|||
|
||||
System::Init(emu_window);
|
||||
|
||||
std::string boot_filename = "homebrew.elf";
|
||||
std::string boot_filename = "C:\\Users\\eric\\Desktop\\3ds\\homebrew\\Mandelbrot3DS.elf";
|
||||
std::string error_str;
|
||||
|
||||
bool res = Loader::LoadFile(boot_filename, &error_str);
|
||||
|
|
|
|||
|
|
@ -199,20 +199,17 @@
|
|||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="src\citra.cpp" />
|
||||
<ClCompile Include="src\emu_window\emu_window_glfw.cpp" />
|
||||
<ClCompile Include="citra.cpp" />
|
||||
<ClCompile Include="emu_window\emu_window_glfw.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="citra.h" />
|
||||
<ClInclude Include="emu_window\emu_window_glfw.h" />
|
||||
<ClInclude Include="resource.h" />
|
||||
<ClInclude Include="src\citra.h" />
|
||||
<ClInclude Include="src\emu_window\emu_window_glfw.h" />
|
||||
<ClInclude Include="src\version.h" />
|
||||
<ClInclude Include="version.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="citra.rc" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="CMakeLists.txt" />
|
||||
<Text Include="CMakeLists.txt" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
|
|
|
|||
|
|
@ -1,28 +1,25 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<ClCompile Include="src\citra.cpp" />
|
||||
<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\citra.h" />
|
||||
<ClInclude Include="src\emu_window\emu_window_glfw.h">
|
||||
<Filter>emu_window</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="citra.rc" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Filter Include="emu_window">
|
||||
<UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="CMakeLists.txt" />
|
||||
<ClCompile Include="citra.cpp" />
|
||||
<ClCompile Include="emu_window\emu_window_glfw.cpp">
|
||||
<Filter>emu_window</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="citra.h" />
|
||||
<ClInclude Include="resource.h" />
|
||||
<ClInclude Include="version.h" />
|
||||
<ClInclude Include="emu_window\emu_window_glfw.h">
|
||||
<Filter>emu_window</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="CMakeLists.txt" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -22,9 +22,9 @@
|
|||
* http://code.google.com/p/gekko-gc-emu/
|
||||
*/
|
||||
|
||||
#include "common.h"
|
||||
#include "video_core.h"
|
||||
#include "emu_window_glfw.h"
|
||||
#include "common/common.h"
|
||||
#include "video_core/video_core.h"
|
||||
#include "citra/emu_window/emu_window_glfw.h"
|
||||
|
||||
static void OnKeyEvent(GLFWwindow* win, int key, int action) {
|
||||
// EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win);
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
#include <GL/glew.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
#include "emu_window.h"
|
||||
#include "common/emu_window.h"
|
||||
|
||||
class EmuWindow_GLFW : public EmuWindow {
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -127,43 +127,21 @@
|
|||
<ClCompile Include="..\..\externals\qhexedit\qhexedit.cpp" />
|
||||
<ClCompile Include="..\..\externals\qhexedit\qhexedit_p.cpp" />
|
||||
<ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp" />
|
||||
<ClCompile Include="src\bootmanager.cpp" />
|
||||
<ClCompile Include="src\callstack.cpp" />
|
||||
<ClCompile Include="src\config\controller_config.cpp" />
|
||||
<ClCompile Include="src\config\controller_config_util.cpp" />
|
||||
<ClCompile Include="src\disasm.cpp" />
|
||||
<ClCompile Include="src\cpu_regs.cpp" />
|
||||
<ClCompile Include="src\hotkeys.cpp" />
|
||||
<ClCompile Include="src\main.cpp" />
|
||||
<ClCompile Include="src\ramview.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MOC Include="src\bootmanager.hxx" />
|
||||
<MOC Include="src\callstack.hxx" />
|
||||
<MOC Include="src\config\controller_config.hxx" />
|
||||
<MOC Include="src\config\controller_config_util.hxx" />
|
||||
<MOC Include="src\disasm.hxx" />
|
||||
<MOC Include="src\cpu_regs.hxx" />
|
||||
<MOC Include="src\hotkeys.hxx" />
|
||||
<MOC Include="src\main.hxx" />
|
||||
<MOC Include="src\ramview.hxx" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<UIC Include="src\callstack.ui" />
|
||||
<UIC Include="src\config\controller_config.ui">
|
||||
<QtUicPrefix>src/config/ui_</QtUicPrefix>
|
||||
</UIC>
|
||||
<UIC Include="src\disasm.ui" />
|
||||
<UIC Include="src\cpu_regs.ui" />
|
||||
<UIC Include="src\hotkeys.ui" />
|
||||
<UIC Include="src\main.ui" />
|
||||
<ClCompile Include="bootmanager.cpp" />
|
||||
<ClCompile Include="callstack.cpp" />
|
||||
<ClCompile Include="config\controller_config.cpp" />
|
||||
<ClCompile Include="config\controller_config_util.cpp" />
|
||||
<ClCompile Include="cpu_regs.cpp" />
|
||||
<ClCompile Include="disasm.cpp" />
|
||||
<ClCompile Include="hotkeys.cpp" />
|
||||
<ClCompile Include="main.cpp" />
|
||||
<ClCompile Include="ramview.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MOC Include="..\..\externals\qhexedit\commands.h" />
|
||||
<MOC Include="..\..\externals\qhexedit\qhexedit.h" />
|
||||
<MOC Include="..\..\externals\qhexedit\qhexedit_p.h" />
|
||||
<MOC Include="..\..\externals\qhexedit\xbytearray.h" />
|
||||
<ClInclude Include="src\version.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\common\common.vcxproj">
|
||||
|
|
@ -173,6 +151,38 @@
|
|||
<Project>{8aea7f29-3466-4786-a10d-6a4bd0610977}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="bootmanager.hxx" />
|
||||
<ClInclude Include="callstack.hxx" />
|
||||
<ClInclude Include="config\controller_config.hxx" />
|
||||
<ClInclude Include="config\controller_config_util.hxx" />
|
||||
<ClInclude Include="config\ui_controller_config.h" />
|
||||
<ClInclude Include="cpu_regs.hxx" />
|
||||
<ClInclude Include="disasm.hxx" />
|
||||
<ClInclude Include="hotkeys.hxx" />
|
||||
<ClInclude Include="main.hxx" />
|
||||
<ClInclude Include="ramview.hxx" />
|
||||
<ClInclude Include="ui_callstack.h" />
|
||||
<ClInclude Include="ui_cpu_regs.h" />
|
||||
<ClInclude Include="ui_disasm.h" />
|
||||
<ClInclude Include="ui_gfx_fifo_player.h" />
|
||||
<ClInclude Include="ui_hotkeys.h" />
|
||||
<ClInclude Include="ui_image_info.h" />
|
||||
<ClInclude Include="ui_main.h" />
|
||||
<ClInclude Include="ui_welcome_wizard.h" />
|
||||
<ClInclude Include="version.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<UIC Include="callstack.ui" />
|
||||
<UIC Include="config\controller_config.ui" />
|
||||
<UIC Include="cpu_regs.ui" />
|
||||
<UIC Include="disasm.ui" />
|
||||
<UIC Include="hotkeys.ui" />
|
||||
<UIC Include="main.ui" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="CMakeLists.txt" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="qt-build.targets" />
|
||||
|
|
|
|||
|
|
@ -12,20 +12,6 @@
|
|||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="src\main.cpp" />
|
||||
<ClCompile Include="src\disasm.cpp">
|
||||
<Filter>debugger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\cpu_regs.cpp">
|
||||
<Filter>debugger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\bootmanager.cpp" />
|
||||
<ClCompile Include="src\callstack.cpp">
|
||||
<Filter>debugger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\ramview.cpp">
|
||||
<Filter>debugger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\externals\qhexedit\commands.cpp">
|
||||
<Filter>qhexedit</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -38,22 +24,29 @@
|
|||
<ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp">
|
||||
<Filter>qhexedit</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\hotkeys.cpp" />
|
||||
<ClCompile Include="src\config\controller_config.cpp">
|
||||
<ClCompile Include="bootmanager.cpp" />
|
||||
<ClCompile Include="hotkeys.cpp" />
|
||||
<ClCompile Include="main.cpp" />
|
||||
<ClCompile Include="config\controller_config.cpp">
|
||||
<Filter>config</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\config\controller_config_util.cpp">
|
||||
<ClCompile Include="config\controller_config_util.cpp">
|
||||
<Filter>config</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="cpu_regs.cpp">
|
||||
<Filter>debugger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="disasm.cpp">
|
||||
<Filter>debugger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ramview.cpp">
|
||||
<Filter>debugger</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="callstack.cpp">
|
||||
<Filter>debugger</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MOC Include="src\main.hxx" />
|
||||
<MOC Include="src\cpu_regs.hxx">
|
||||
<Filter>debugger</Filter>
|
||||
</MOC>
|
||||
<MOC Include="src\callstack.hxx">
|
||||
<Filter>debugger</Filter>
|
||||
</MOC>
|
||||
<MOC Include="..\..\externals\qhexedit\commands.h">
|
||||
<Filter>qhexedit</Filter>
|
||||
</MOC>
|
||||
|
|
@ -66,38 +59,67 @@
|
|||
<MOC Include="..\..\externals\qhexedit\qhexedit.h">
|
||||
<Filter>qhexedit</Filter>
|
||||
</MOC>
|
||||
<MOC Include="src\ramview.hxx">
|
||||
<Filter>debugger</Filter>
|
||||
</MOC>
|
||||
<MOC Include="src\disasm.hxx">
|
||||
<Filter>debugger</Filter>
|
||||
</MOC>
|
||||
<MOC Include="src\bootmanager.hxx" />
|
||||
<MOC Include="src\hotkeys.hxx" />
|
||||
<MOC Include="src\config\controller_config.hxx">
|
||||
<Filter>config</Filter>
|
||||
</MOC>
|
||||
<MOC Include="src\config\controller_config_util.hxx">
|
||||
<Filter>config</Filter>
|
||||
</MOC>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<UIC Include="src\main.ui" />
|
||||
<UIC Include="src\cpu_regs.ui">
|
||||
<Filter>debugger</Filter>
|
||||
</UIC>
|
||||
<UIC Include="src\disasm.ui">
|
||||
<Filter>debugger</Filter>
|
||||
</UIC>
|
||||
<UIC Include="src\callstack.ui">
|
||||
<Filter>debugger</Filter>
|
||||
</UIC>
|
||||
<UIC Include="src\hotkeys.ui" />
|
||||
<UIC Include="src\config\controller_config.ui">
|
||||
<ClInclude Include="bootmanager.hxx" />
|
||||
<ClInclude Include="hotkeys.hxx" />
|
||||
<ClInclude Include="main.hxx" />
|
||||
<ClInclude Include="ui_hotkeys.h" />
|
||||
<ClInclude Include="ui_image_info.h" />
|
||||
<ClInclude Include="ui_main.h" />
|
||||
<ClInclude Include="ui_welcome_wizard.h" />
|
||||
<ClInclude Include="version.h" />
|
||||
<ClInclude Include="config\controller_config.hxx">
|
||||
<Filter>config</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="config\controller_config_util.hxx">
|
||||
<Filter>config</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="config\ui_controller_config.h">
|
||||
<Filter>config</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="cpu_regs.hxx">
|
||||
<Filter>debugger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="disasm.hxx">
|
||||
<Filter>debugger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ramview.hxx">
|
||||
<Filter>debugger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ui_callstack.h">
|
||||
<Filter>debugger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ui_cpu_regs.h">
|
||||
<Filter>debugger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ui_disasm.h">
|
||||
<Filter>debugger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ui_gfx_fifo_player.h">
|
||||
<Filter>debugger</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="callstack.hxx">
|
||||
<Filter>debugger</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<UIC Include="hotkeys.ui" />
|
||||
<UIC Include="main.ui" />
|
||||
<UIC Include="config\controller_config.ui">
|
||||
<Filter>config</Filter>
|
||||
</UIC>
|
||||
<UIC Include="callstack.ui">
|
||||
<Filter>debugger</Filter>
|
||||
</UIC>
|
||||
<UIC Include="cpu_regs.ui">
|
||||
<Filter>debugger</Filter>
|
||||
</UIC>
|
||||
<UIC Include="disasm.ui">
|
||||
<Filter>debugger</Filter>
|
||||
</UIC>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="src\version.h" />
|
||||
<Text Include="CMakeLists.txt" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
#ifdef _WIN32
|
||||
|
||||
#include "atomic_win32.h"
|
||||
#include "common/atomic_win32.h"
|
||||
|
||||
#else
|
||||
|
||||
// GCC-compatible compiler assumed!
|
||||
#include "atomic_gcc.h"
|
||||
#include "common/atomic_gcc.h"
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#ifndef _ATOMIC_GCC_H_
|
||||
#define _ATOMIC_GCC_H_
|
||||
|
||||
#include "common.h"
|
||||
#include "common/common.h"
|
||||
|
||||
// Atomic operations are performed in a single step by the CPU. It is
|
||||
// impossible for other threads to see the operation "half-done."
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#ifndef _ATOMIC_WIN32_H_
|
||||
#define _ATOMIC_WIN32_H_
|
||||
|
||||
#include "common.h"
|
||||
#include "common/common.h"
|
||||
#include <intrin.h>
|
||||
#include <Windows.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "common.h"
|
||||
#include "debug_interface.h"
|
||||
#include "break_points.h"
|
||||
#include "common/common.h"
|
||||
#include "common/debug_interface.h"
|
||||
#include "common/break_points.h"
|
||||
|
||||
#include <sstream>
|
||||
#include <algorithm>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
#include "common.h"
|
||||
#include "common/common.h"
|
||||
|
||||
class DebugInterface;
|
||||
|
||||
|
|
|
|||
|
|
@ -41,8 +41,8 @@
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#include "common.h"
|
||||
#include "file_util.h"
|
||||
#include "common/common.h"
|
||||
#include "common/file_util.h"
|
||||
//#include "../ext/snappy/snappy-c.h"
|
||||
|
||||
#if defined(IOS) || defined(MACGNUSTD)
|
||||
|
|
|
|||
|
|
@ -43,12 +43,12 @@ private:
|
|||
};
|
||||
#endif
|
||||
|
||||
#include "log.h"
|
||||
#include "common_types.h"
|
||||
#include "msg_handler.h"
|
||||
#include "common_funcs.h"
|
||||
#include "common_paths.h"
|
||||
#include "platform.h"
|
||||
#include "common/log.h"
|
||||
#include "common/common_types.h"
|
||||
#include "common/msg_handler.h"
|
||||
#include "common/common_funcs.h"
|
||||
#include "common/common_paths.h"
|
||||
#include "common/platform.h"
|
||||
|
||||
#ifdef __APPLE__
|
||||
// The Darwin ABI requires that stack frames be aligned to 16-byte boundaries.
|
||||
|
|
|
|||
|
|
@ -146,67 +146,6 @@
|
|||
</Link>
|
||||
<Lib />
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="src\atomic.h" />
|
||||
<ClInclude Include="src\atomic_gcc.h" />
|
||||
<ClInclude Include="src\atomic_win32.h" />
|
||||
<ClInclude Include="src\break_points.h" />
|
||||
<ClInclude Include="src\chunk_file.h" />
|
||||
<ClInclude Include="src\common.h" />
|
||||
<ClInclude Include="src\common_funcs.h" />
|
||||
<ClInclude Include="src\common_paths.h" />
|
||||
<ClInclude Include="src\common_types.h" />
|
||||
<ClInclude Include="src\console_listener.h" />
|
||||
<ClInclude Include="src\cpu_detect.h" />
|
||||
<ClInclude Include="src\debug_interface.h" />
|
||||
<ClInclude Include="src\emu_window.h" />
|
||||
<ClInclude Include="src\extended_trace.h" />
|
||||
<ClInclude Include="src\fifo_queue.h" />
|
||||
<ClInclude Include="src\file_search.h" />
|
||||
<ClInclude Include="src\file_util.h" />
|
||||
<ClInclude Include="src\fixed_size_queue.h" />
|
||||
<ClInclude Include="src\hash.h" />
|
||||
<ClInclude Include="src\linear_disk_cache.h" />
|
||||
<ClInclude Include="src\log.h" />
|
||||
<ClInclude Include="src\log_manager.h" />
|
||||
<ClInclude Include="src\math_util.h" />
|
||||
<ClInclude Include="src\memory_util.h" />
|
||||
<ClInclude Include="src\mem_arena.h" />
|
||||
<ClInclude Include="src\msg_handler.h" />
|
||||
<ClInclude Include="src\platform.h" />
|
||||
<ClInclude Include="src\scm_rev.h" />
|
||||
<ClInclude Include="src\std_condition_variable.h" />
|
||||
<ClInclude Include="src\std_mutex.h" />
|
||||
<ClInclude Include="src\std_thread.h" />
|
||||
<ClInclude Include="src\string_util.h" />
|
||||
<ClInclude Include="src\swap.h" />
|
||||
<ClInclude Include="src\thread.h" />
|
||||
<ClInclude Include="src\thunk.h" />
|
||||
<ClInclude Include="src\timer.h" />
|
||||
<ClInclude Include="src\utf8.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="src\break_points.cpp" />
|
||||
<ClCompile Include="src\console_listener.cpp" />
|
||||
<ClCompile Include="src\extended_trace.cpp" />
|
||||
<ClCompile Include="src\file_search.cpp" />
|
||||
<ClCompile Include="src\file_util.cpp" />
|
||||
<ClCompile Include="src\hash.cpp" />
|
||||
<ClCompile Include="src\log_manager.cpp" />
|
||||
<ClCompile Include="src\math_util.cpp" />
|
||||
<ClCompile Include="src\memory_util.cpp" />
|
||||
<ClCompile Include="src\mem_arena.cpp" />
|
||||
<ClCompile Include="src\misc.cpp" />
|
||||
<ClCompile Include="src\msg_handler.cpp" />
|
||||
<ClCompile Include="src\string_util.cpp" />
|
||||
<ClCompile Include="src\thread.cpp" />
|
||||
<ClCompile Include="src\timer.cpp" />
|
||||
<ClCompile Include="src\utf8.cpp" />
|
||||
<ClCompile Include="src\version.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="CMakeLists.txt" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Data" />
|
||||
|
|
@ -214,6 +153,66 @@
|
|||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="atomic.h" />
|
||||
<ClInclude Include="atomic_gcc.h" />
|
||||
<ClInclude Include="atomic_win32.h" />
|
||||
<ClInclude Include="break_points.h" />
|
||||
<ClInclude Include="chunk_file.h" />
|
||||
<ClInclude Include="common.h" />
|
||||
<ClInclude Include="common_funcs.h" />
|
||||
<ClInclude Include="common_paths.h" />
|
||||
<ClInclude Include="common_types.h" />
|
||||
<ClInclude Include="console_listener.h" />
|
||||
<ClInclude Include="cpu_detect.h" />
|
||||
<ClInclude Include="debug_interface.h" />
|
||||
<ClInclude Include="emu_window.h" />
|
||||
<ClInclude Include="extended_trace.h" />
|
||||
<ClInclude Include="fifo_queue.h" />
|
||||
<ClInclude Include="file_search.h" />
|
||||
<ClInclude Include="file_util.h" />
|
||||
<ClInclude Include="fixed_size_queue.h" />
|
||||
<ClInclude Include="hash.h" />
|
||||
<ClInclude Include="linear_disk_cache.h" />
|
||||
<ClInclude Include="log.h" />
|
||||
<ClInclude Include="log_manager.h" />
|
||||
<ClInclude Include="math_util.h" />
|
||||
<ClInclude Include="memory_util.h" />
|
||||
<ClInclude Include="mem_arena.h" />
|
||||
<ClInclude Include="msg_handler.h" />
|
||||
<ClInclude Include="platform.h" />
|
||||
<ClInclude Include="std_condition_variable.h" />
|
||||
<ClInclude Include="std_mutex.h" />
|
||||
<ClInclude Include="std_thread.h" />
|
||||
<ClInclude Include="string_util.h" />
|
||||
<ClInclude Include="swap.h" />
|
||||
<ClInclude Include="thread.h" />
|
||||
<ClInclude Include="thunk.h" />
|
||||
<ClInclude Include="timer.h" />
|
||||
<ClInclude Include="utf8.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="break_points.cpp" />
|
||||
<ClCompile Include="console_listener.cpp" />
|
||||
<ClCompile Include="extended_trace.cpp" />
|
||||
<ClCompile Include="file_search.cpp" />
|
||||
<ClCompile Include="file_util.cpp" />
|
||||
<ClCompile Include="hash.cpp" />
|
||||
<ClCompile Include="log_manager.cpp" />
|
||||
<ClCompile Include="math_util.cpp" />
|
||||
<ClCompile Include="memory_util.cpp" />
|
||||
<ClCompile Include="mem_arena.cpp" />
|
||||
<ClCompile Include="misc.cpp" />
|
||||
<ClCompile Include="msg_handler.cpp" />
|
||||
<ClCompile Include="string_util.cpp" />
|
||||
<ClCompile Include="thread.cpp" />
|
||||
<ClCompile Include="timer.cpp" />
|
||||
<ClCompile Include="utf8.cpp" />
|
||||
<ClCompile Include="version.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="CMakeLists.txt" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
|
|
|
|||
|
|
@ -1,64 +1,63 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<ClCompile Include="src\break_points.cpp" />
|
||||
<ClCompile Include="src\console_listener.cpp" />
|
||||
<ClCompile Include="src\extended_trace.cpp" />
|
||||
<ClCompile Include="src\file_search.cpp" />
|
||||
<ClCompile Include="src\file_util.cpp" />
|
||||
<ClCompile Include="src\hash.cpp" />
|
||||
<ClCompile Include="src\log_manager.cpp" />
|
||||
<ClCompile Include="src\math_util.cpp" />
|
||||
<ClCompile Include="src\memory_util.cpp" />
|
||||
<ClCompile Include="src\mem_arena.cpp" />
|
||||
<ClCompile Include="src\misc.cpp" />
|
||||
<ClCompile Include="src\msg_handler.cpp" />
|
||||
<ClCompile Include="src\string_util.cpp" />
|
||||
<ClCompile Include="src\thread.cpp" />
|
||||
<ClCompile Include="src\timer.cpp" />
|
||||
<ClCompile Include="src\version.cpp" />
|
||||
<ClCompile Include="src\utf8.cpp" />
|
||||
<ClInclude Include="atomic.h" />
|
||||
<ClInclude Include="atomic_gcc.h" />
|
||||
<ClInclude Include="atomic_win32.h" />
|
||||
<ClInclude Include="break_points.h" />
|
||||
<ClInclude Include="chunk_file.h" />
|
||||
<ClInclude Include="common.h" />
|
||||
<ClInclude Include="common_funcs.h" />
|
||||
<ClInclude Include="common_paths.h" />
|
||||
<ClInclude Include="common_types.h" />
|
||||
<ClInclude Include="console_listener.h" />
|
||||
<ClInclude Include="cpu_detect.h" />
|
||||
<ClInclude Include="debug_interface.h" />
|
||||
<ClInclude Include="emu_window.h" />
|
||||
<ClInclude Include="extended_trace.h" />
|
||||
<ClInclude Include="fifo_queue.h" />
|
||||
<ClInclude Include="file_search.h" />
|
||||
<ClInclude Include="file_util.h" />
|
||||
<ClInclude Include="fixed_size_queue.h" />
|
||||
<ClInclude Include="hash.h" />
|
||||
<ClInclude Include="linear_disk_cache.h" />
|
||||
<ClInclude Include="log.h" />
|
||||
<ClInclude Include="log_manager.h" />
|
||||
<ClInclude Include="math_util.h" />
|
||||
<ClInclude Include="mem_arena.h" />
|
||||
<ClInclude Include="memory_util.h" />
|
||||
<ClInclude Include="msg_handler.h" />
|
||||
<ClInclude Include="platform.h" />
|
||||
<ClInclude Include="std_condition_variable.h" />
|
||||
<ClInclude Include="std_mutex.h" />
|
||||
<ClInclude Include="std_thread.h" />
|
||||
<ClInclude Include="string_util.h" />
|
||||
<ClInclude Include="swap.h" />
|
||||
<ClInclude Include="thread.h" />
|
||||
<ClInclude Include="thunk.h" />
|
||||
<ClInclude Include="timer.h" />
|
||||
<ClInclude Include="utf8.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="src\atomic.h" />
|
||||
<ClInclude Include="src\break_points.h" />
|
||||
<ClInclude Include="src\chunk_file.h" />
|
||||
<ClInclude Include="src\common.h" />
|
||||
<ClInclude Include="src\common_funcs.h" />
|
||||
<ClInclude Include="src\common_paths.h" />
|
||||
<ClInclude Include="src\common_types.h" />
|
||||
<ClInclude Include="src\console_listener.h" />
|
||||
<ClInclude Include="src\cpu_detect.h" />
|
||||
<ClInclude Include="src\debug_interface.h" />
|
||||
<ClInclude Include="src\extended_trace.h" />
|
||||
<ClInclude Include="src\fifo_queue.h" />
|
||||
<ClInclude Include="src\file_search.h" />
|
||||
<ClInclude Include="src\file_util.h" />
|
||||
<ClInclude Include="src\fixed_size_queue.h" />
|
||||
<ClInclude Include="src\hash.h" />
|
||||
<ClInclude Include="src\linear_disk_cache.h" />
|
||||
<ClInclude Include="src\log.h" />
|
||||
<ClInclude Include="src\log_manager.h" />
|
||||
<ClInclude Include="src\math_util.h" />
|
||||
<ClInclude Include="src\memory_util.h" />
|
||||
<ClInclude Include="src\mem_arena.h" />
|
||||
<ClInclude Include="src\msg_handler.h" />
|
||||
<ClInclude Include="src\scm_rev.h" />
|
||||
<ClInclude Include="src\std_condition_variable.h" />
|
||||
<ClInclude Include="src\std_mutex.h" />
|
||||
<ClInclude Include="src\std_thread.h" />
|
||||
<ClInclude Include="src\string_util.h" />
|
||||
<ClInclude Include="src\thread.h" />
|
||||
<ClInclude Include="src\thunk.h" />
|
||||
<ClInclude Include="src\timer.h" />
|
||||
<ClInclude Include="src\atomic_gcc.h" />
|
||||
<ClInclude Include="src\atomic_win32.h" />
|
||||
<ClInclude Include="src\emu_window.h" />
|
||||
<ClInclude Include="src\platform.h" />
|
||||
<ClInclude Include="src\swap.h" />
|
||||
<ClInclude Include="src\utf8.h" />
|
||||
<ClCompile Include="break_points.cpp" />
|
||||
<ClCompile Include="console_listener.cpp" />
|
||||
<ClCompile Include="extended_trace.cpp" />
|
||||
<ClCompile Include="file_search.cpp" />
|
||||
<ClCompile Include="file_util.cpp" />
|
||||
<ClCompile Include="hash.cpp" />
|
||||
<ClCompile Include="log_manager.cpp" />
|
||||
<ClCompile Include="math_util.cpp" />
|
||||
<ClCompile Include="mem_arena.cpp" />
|
||||
<ClCompile Include="memory_util.cpp" />
|
||||
<ClCompile Include="misc.cpp" />
|
||||
<ClCompile Include="msg_handler.cpp" />
|
||||
<ClCompile Include="string_util.cpp" />
|
||||
<ClCompile Include="thread.cpp" />
|
||||
<ClCompile Include="timer.cpp" />
|
||||
<ClCompile Include="utf8.cpp" />
|
||||
<ClCompile Include="version.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="CMakeLists.txt" />
|
||||
<Text Include="CMakeLists.txt" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
#define _COMMON_PATHS_H_
|
||||
|
||||
// Make sure we pick up USER_DIR if set in config.h
|
||||
#include "common.h"
|
||||
#include "common/common.h"
|
||||
|
||||
// Directory seperators, do we need this?
|
||||
#define DIR_SEP "/"
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ typedef signed long long s64; ///< 64-bit signed int
|
|||
typedef float f32; ///< 32-bit floating point
|
||||
typedef double f64; ///< 64-bit floating point
|
||||
|
||||
#include "swap.h"
|
||||
#include "common/swap.h"
|
||||
|
||||
/// Union for fast 16-bit type casting
|
||||
union t16 {
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@
|
|||
#include <stdarg.h>
|
||||
#endif
|
||||
|
||||
#include "common.h"
|
||||
#include "log_manager.h" // Common
|
||||
#include "console_listener.h" // Common
|
||||
#include "common/common.h"
|
||||
#include "common/log_manager.h" // Common
|
||||
#include "common/console_listener.h" // Common
|
||||
|
||||
ConsoleListener::ConsoleListener()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#ifndef _CONSOLELISTENER_H
|
||||
#define _CONSOLELISTENER_H
|
||||
|
||||
#include "log_manager.h"
|
||||
#include "common/log_manager.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue