yuzu-emu/yuzu-mainline
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-mainline.git synced 2024-12-12 17:34:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated common paths

Browse Source
This commit is contained in:
ShizZy 2013-09-08 13:17:27 -04:00
parent 62d873da3e
commit 6847033b27
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/akiru/src/akiru.cpp
View File

@ -23,6 +23,7 @@
*/ */
#include "common.h" #include "common.h"
#include "file_util.h"
//#if EMU_PLATFORM == PLATFORM_LINUX //#if EMU_PLATFORM == PLATFORM_LINUX
//#include <unistd.h> //#include <unistd.h>
@ -40,18 +41,9 @@ int __cdecl main(int argc, char **argv) {
printf("akiru starting...\n"); printf("akiru starting...\n");
//char program_dir[MAX_PATH]; std::string program_dir = File::GetCurrentDir();
//_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; //EmuWindow_GLFW* emu_window = new EmuWindow_GLFW;
//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)) { //if (E_OK != core::Init(emu_window)) {
// LOG_ERROR(TMASTER, "core initialization failed, exiting..."); // LOG_ERROR(TMASTER, "core initialization failed, exiting...");
@ -89,7 +81,7 @@ int __cdecl main(int argc, char **argv) {
while (1) { while (1) {
} }
delete emu_window; //delete emu_window;
return 0; return 0;
} }

1
src/common/src/common.h
View File

@ -47,6 +47,7 @@ private:
#include "common_types.h" #include "common_types.h"
#include "msg_handler.h" #include "msg_handler.h"
#include "common_funcs.h" #include "common_funcs.h"
#include "common_paths.h"
#ifdef __APPLE__ #ifdef __APPLE__
// The Darwin ABI requires that stack frames be aligned to 16-byte boundaries. // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries.

10
src/common/src/common_paths.h
View File

@ -12,17 +12,19 @@
#define DIR_SEP "/" #define DIR_SEP "/"
#define DIR_SEP_CHR '/' #define DIR_SEP_CHR '/'
#define MAX_PATH 255
// The user data dir // The user data dir
#define ROOT_DIR "." #define ROOT_DIR "."
#ifdef _WIN32 #ifdef _WIN32
#define USERDATA_DIR "user" #define USERDATA_DIR "user"
#define DOLPHIN_DATA_DIR "akiru" #define EMU_DATA_DIR "emu"
#else #else
#define USERDATA_DIR "user" #define USERDATA_DIR "user"
#ifdef USER_DIR #ifdef USER_DIR
#define DOLPHIN_DATA_DIR USER_DIR #define EMU_DATA_DIR USER_DIR
#else #else
#define DOLPHIN_DATA_DIR ".akiru" #define EMU_DATA_DIR ".akiru"
#endif #endif
#endif #endif
@ -61,7 +63,7 @@
// Filenames // Filenames
// Files in the directory returned by GetUserPath(D_CONFIG_IDX) // 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 DEBUGGER_CONFIG "debugger.ini"
#define LOGGER_CONFIG "logger.ini" #define LOGGER_CONFIG "logger.ini"

2
src/core/src/core.cpp
View File

@ -23,6 +23,7 @@
*/ */
#include "core.h" #include "core.h"
#include "mem_map.h"
namespace Core { namespace Core {
@ -40,6 +41,7 @@ void Stop() {
/// Initialize the core /// Initialize the core
int Init(EmuWindow* emu_window) { int Init(EmuWindow* emu_window) {
Memory::Init();
return 0; return 0;
} }