diff options
author | ShizZy <shizzy@6bit.net> | 2013-09-08 19:17:27 +0200 |
---|---|---|
committer | ShizZy <shizzy@6bit.net> | 2013-09-08 19:17:27 +0200 |
commit | 6847033b27cb07c566d75fb291131910a4296702 (patch) | |
tree | 83675e98f19a6dc597c90a139c70b0a18d713c9b | |
parent | start of 3DS memory map (diff) | |
download | yuzu-6847033b27cb07c566d75fb291131910a4296702.tar yuzu-6847033b27cb07c566d75fb291131910a4296702.tar.gz yuzu-6847033b27cb07c566d75fb291131910a4296702.tar.bz2 yuzu-6847033b27cb07c566d75fb291131910a4296702.tar.lz yuzu-6847033b27cb07c566d75fb291131910a4296702.tar.xz yuzu-6847033b27cb07c566d75fb291131910a4296702.tar.zst yuzu-6847033b27cb07c566d75fb291131910a4296702.zip |
-rw-r--r-- | src/akiru/src/akiru.cpp | 16 | ||||
-rw-r--r-- | src/common/src/common.h | 1 | ||||
-rw-r--r-- | src/common/src/common_paths.h | 10 | ||||
-rw-r--r-- | src/core/src/core.cpp | 2 |
4 files changed, 13 insertions, 16 deletions
diff --git a/src/akiru/src/akiru.cpp b/src/akiru/src/akiru.cpp index bb69cf1b1..3185c2f95 100644 --- a/src/akiru/src/akiru.cpp +++ b/src/akiru/src/akiru.cpp @@ -23,6 +23,7 @@ */ #include "common.h" +#include "file_util.h" //#if EMU_PLATFORM == PLATFORM_LINUX //#include <unistd.h> @@ -40,18 +41,9 @@ int __cdecl main(int argc, char **argv) { 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'; + std::string program_dir = File::GetCurrentDir(); - //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; + //EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; //if (E_OK != core::Init(emu_window)) { // LOG_ERROR(TMASTER, "core initialization failed, exiting..."); @@ -89,7 +81,7 @@ int __cdecl main(int argc, char **argv) { while (1) { } - delete emu_window; + //delete emu_window; return 0; } diff --git a/src/common/src/common.h b/src/common/src/common.h index f95d58074..b61e77686 100644 --- a/src/common/src/common.h +++ b/src/common/src/common.h @@ -47,6 +47,7 @@ private: #include "common_types.h" #include "msg_handler.h" #include "common_funcs.h" +#include "common_paths.h" #ifdef __APPLE__ // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries. diff --git a/src/common/src/common_paths.h b/src/common/src/common_paths.h index 9af93ab74..b38ae6903 100644 --- a/src/common/src/common_paths.h +++ b/src/common/src/common_paths.h @@ -12,17 +12,19 @@ #define DIR_SEP "/" #define DIR_SEP_CHR '/' +#define MAX_PATH 255 + // The user data dir #define ROOT_DIR "." #ifdef _WIN32 #define USERDATA_DIR "user" - #define DOLPHIN_DATA_DIR "akiru" + #define EMU_DATA_DIR "emu" #else #define USERDATA_DIR "user" #ifdef USER_DIR - #define DOLPHIN_DATA_DIR USER_DIR + #define EMU_DATA_DIR USER_DIR #else - #define DOLPHIN_DATA_DIR ".akiru" + #define EMU_DATA_DIR ".akiru" #endif #endif @@ -61,7 +63,7 @@ // Filenames // Files in the directory returned by GetUserPath(D_CONFIG_IDX) -#define AKIRU_CONFIG "akiru.ini" +#define EMU_CONFIG "emu.ini" #define DEBUGGER_CONFIG "debugger.ini" #define LOGGER_CONFIG "logger.ini" diff --git a/src/core/src/core.cpp b/src/core/src/core.cpp index 4e956fde3..61e3a8df4 100644 --- a/src/core/src/core.cpp +++ b/src/core/src/core.cpp @@ -23,6 +23,7 @@ */ #include "core.h" +#include "mem_map.h" namespace Core { @@ -40,6 +41,7 @@ void Stop() { /// Initialize the core int Init(EmuWindow* emu_window) { + Memory::Init(); return 0; } |