summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorGravatar ShizZy2013-09-08 20:42:03 -0400
committerGravatar ShizZy2013-09-08 20:42:03 -0400
commitc2867f7e14d24be08da6af6b4381ca1c7763391c (patch)
tree35a3a6dd361238fbc4da3931d3e969355663a83a /src/common
parentre-enabled GetLastErrorMsg (diff)
downloadyuzu-c2867f7e14d24be08da6af6b4381ca1c7763391c.tar.gz
yuzu-c2867f7e14d24be08da6af6b4381ca1c7763391c.tar.xz
yuzu-c2867f7e14d24be08da6af6b4381ca1c7763391c.zip
removed unneeded dolphin paths code, fixed linker problems with common.lib
Diffstat (limited to 'src/common')
-rw-r--r--src/common/src/common_paths.h10
-rw-r--r--src/common/src/file_util.cpp222
-rw-r--r--src/common/src/file_util.h18
3 files changed, 118 insertions, 132 deletions
diff --git a/src/common/src/common_paths.h b/src/common/src/common_paths.h
index b38ae6903..fae810bf0 100644
--- a/src/common/src/common_paths.h
+++ b/src/common/src/common_paths.h
@@ -12,7 +12,9 @@
12#define DIR_SEP "/" 12#define DIR_SEP "/"
13#define DIR_SEP_CHR '/' 13#define DIR_SEP_CHR '/'
14 14
15#define MAX_PATH 255 15#ifndef MAX_PATH
16#define MAX_PATH 260
17#endif
16 18
17// The user data dir 19// The user data dir
18#define ROOT_DIR "." 20#define ROOT_DIR "."
@@ -60,6 +62,7 @@
60#define DUMP_AUDIO_DIR "audio" 62#define DUMP_AUDIO_DIR "audio"
61#define LOGS_DIR "logs" 63#define LOGS_DIR "logs"
62#define SHADERS_DIR "shaders" 64#define SHADERS_DIR "shaders"
65#define SYSCONF_DIR "sysconf"
63 66
64// Filenames 67// Filenames
65// Files in the directory returned by GetUserPath(D_CONFIG_IDX) 68// Files in the directory returned by GetUserPath(D_CONFIG_IDX)
@@ -68,6 +71,9 @@
68#define LOGGER_CONFIG "logger.ini" 71#define LOGGER_CONFIG "logger.ini"
69 72
70// Files in the directory returned by GetUserPath(D_LOGS_IDX) 73// Files in the directory returned by GetUserPath(D_LOGS_IDX)
71#define MAIN_LOG "akiru.log" 74#define MAIN_LOG "emu.log"
75
76// Files in the directory returned by GetUserPath(D_SYSCONF_IDX)
77#define SYSCONF "SYSCONF"
72 78
73#endif // _COMMON_PATHS_H_ 79#endif // _COMMON_PATHS_H_
diff --git a/src/common/src/file_util.cpp b/src/common/src/file_util.cpp
index f86414bf3..6a7f92754 100644
--- a/src/common/src/file_util.cpp
+++ b/src/common/src/file_util.cpp
@@ -657,129 +657,117 @@ std::string GetSysDirectory()
657 657
658// Returns a string with a Dolphin data dir or file in the user's home 658// Returns a string with a Dolphin data dir or file in the user's home
659// directory. To be used in "multi-user" mode (that is, installed). 659// directory. To be used in "multi-user" mode (that is, installed).
660//const std::string& GetUserPath(const unsigned int DirIDX, const std::string &newPath) 660const std::string& GetUserPath(const unsigned int DirIDX, const std::string &newPath)
661//{
662// static std::string paths[NUM_PATH_INDICES];
663//
664// // Set up all paths and files on the first run
665// if (paths[D_USER_IDX].empty())
666// {
667//#ifdef _WIN32
668// paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
669//#else
670// if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR))
671// paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP;
672// else
673// paths[D_USER_IDX] = std::string(getenv("HOME") ?
674// getenv("HOME") : getenv("PWD") ?
675// getenv("PWD") : "") + DIR_SEP DOLPHIN_DATA_DIR DIR_SEP;
676//#endif
677//
678// paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
679// paths[D_GAMECONFIG_IDX] = paths[D_USER_IDX] + GAMECONFIG_DIR DIR_SEP;
680// paths[D_MAPS_IDX] = paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
681// paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
682// paths[D_SHADERCACHE_IDX] = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
683// paths[D_SHADERS_IDX] = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP;
684// paths[D_STATESAVES_IDX] = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP;
685// paths[D_SCREENSHOTS_IDX] = paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP;
686// paths[D_DUMP_IDX] = paths[D_USER_IDX] + DUMP_DIR DIR_SEP;
687// paths[D_DUMPFRAMES_IDX] = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
688// paths[D_DUMPAUDIO_IDX] = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
689// paths[D_DUMPTEXTURES_IDX] = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
690// paths[D_LOGS_IDX] = paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
691// paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
692// paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG;
693// paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG;
694// }
695//
696// if (!newPath.empty())
697// {
698// if (!File::IsDirectory(newPath))
699// {
700// WARN_LOG(COMMON, "Invalid path specified %s", newPath.c_str());
701// return paths[DirIDX];
702// }
703// else
704// {
705// paths[DirIDX] = newPath;
706// }
707//
708// switch (DirIDX)
709// {
710// case D_WIIROOT_IDX:
711// paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP;
712// paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR + DIR_SEP;
713// paths[F_WIISYSCONF_IDX] = paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
714// break;
715//
716// case D_USER_IDX:
717// paths[D_GCUSER_IDX] = paths[D_USER_IDX] + GC_USER_DIR DIR_SEP;
718// paths[D_WIIROOT_IDX] = paths[D_USER_IDX] + WII_USER_DIR;
719// paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP;
720// paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
721// paths[D_GAMECONFIG_IDX] = paths[D_USER_IDX] + GAMECONFIG_DIR DIR_SEP;
722// paths[D_MAPS_IDX] = paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
723// paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
724// paths[D_SHADERCACHE_IDX] = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
725// paths[D_SHADERS_IDX] = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP;
726// paths[D_STATESAVES_IDX] = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP;
727// paths[D_SCREENSHOTS_IDX] = paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP;
728// paths[D_OPENCL_IDX] = paths[D_USER_IDX] + OPENCL_DIR DIR_SEP;
729// paths[D_HIRESTEXTURES_IDX] = paths[D_USER_IDX] + HIRES_TEXTURES_DIR DIR_SEP;
730// paths[D_DUMP_IDX] = paths[D_USER_IDX] + DUMP_DIR DIR_SEP;
731// paths[D_DUMPFRAMES_IDX] = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
732// paths[D_DUMPAUDIO_IDX] = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
733// paths[D_DUMPTEXTURES_IDX] = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
734// paths[D_DUMPDSP_IDX] = paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
735// paths[D_LOGS_IDX] = paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
736// paths[D_MAILLOGS_IDX] = paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP;
737// paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP;
738// paths[D_THEMES_IDX] = paths[D_USER_IDX] + THEMES_DIR DIR_SEP;
739// paths[F_DOLPHINCONFIG_IDX] = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
740// paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
741// paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG;
742// paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG;
743// paths[F_WIISYSCONF_IDX] = paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
744// paths[F_RAMDUMP_IDX] = paths[D_DUMP_IDX] + RAM_DUMP;
745// paths[F_ARAMDUMP_IDX] = paths[D_DUMP_IDX] + ARAM_DUMP;
746// paths[F_FAKEVMEMDUMP_IDX] = paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
747// paths[F_GCSRAM_IDX] = paths[D_GCUSER_IDX] + GC_SRAM;
748// break;
749//
750// case D_CONFIG_IDX:
751// paths[F_DOLPHINCONFIG_IDX] = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
752// paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
753// paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG;
754// break;
755//
756// case D_DUMP_IDX:
757// paths[D_DUMPFRAMES_IDX] = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
758// paths[D_DUMPAUDIO_IDX] = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
759// paths[D_DUMPTEXTURES_IDX] = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
760// break;
761//
762// case D_LOGS_IDX:
763// paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG;
764// }
765// }
766//
767// return paths[DirIDX];
768//}
769
770std::string GetThemeDir(const std::string& theme_name)
771{ 661{
772 std::string dir = File::GetUserPath(D_THEMES_IDX) + theme_name + "/"; 662 static std::string paths[NUM_PATH_INDICES];
773 663
774#if !defined(_WIN32) 664 // Set up all paths and files on the first run
775 // If theme does not exist in user's dir load from shared directory 665 if (paths[D_USER_IDX].empty())
776 if (!File::Exists(dir)) 666 {
777 dir = SHARED_USER_DIR THEMES_DIR "/" + theme_name + "/"; 667#ifdef _WIN32
668 paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
669#else
670 if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR))
671 paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP;
672 else
673 paths[D_USER_IDX] = std::string(getenv("HOME") ?
674 getenv("HOME") : getenv("PWD") ?
675 getenv("PWD") : "") + DIR_SEP DOLPHIN_DATA_DIR DIR_SEP;
778#endif 676#endif
677
678 paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
679 paths[D_GAMECONFIG_IDX] = paths[D_USER_IDX] + GAMECONFIG_DIR DIR_SEP;
680 paths[D_MAPS_IDX] = paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
681 paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
682 paths[D_SHADERCACHE_IDX] = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
683 paths[D_SHADERS_IDX] = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP;
684 paths[D_STATESAVES_IDX] = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP;
685 paths[D_SCREENSHOTS_IDX] = paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP;
686 paths[D_DUMP_IDX] = paths[D_USER_IDX] + DUMP_DIR DIR_SEP;
687 paths[D_DUMPFRAMES_IDX] = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
688 paths[D_DUMPAUDIO_IDX] = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
689 paths[D_DUMPTEXTURES_IDX] = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
690 paths[D_LOGS_IDX] = paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
691 paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
692 paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG;
693 paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG;
694 }
695
696 if (!newPath.empty())
697 {
698 if (!File::IsDirectory(newPath))
699 {
700 WARN_LOG(COMMON, "Invalid path specified %s", newPath.c_str());
701 return paths[DirIDX];
702 }
703 else
704 {
705 paths[DirIDX] = newPath;
706 }
707
708 switch (DirIDX)
709 {
710 case D_ROOT_IDX:
711 paths[D_USER_IDX] = paths[D_ROOT_IDX] + DIR_SEP;
712 paths[D_SYSCONF_IDX] = paths[D_USER_IDX] + SYSCONF_DIR + DIR_SEP;
713 paths[F_SYSCONF_IDX] = paths[D_SYSCONF_IDX] + SYSCONF;
714 break;
715
716 case D_USER_IDX:
717 paths[D_USER_IDX] = paths[D_ROOT_IDX] + DIR_SEP;
718 paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
719 paths[D_GAMECONFIG_IDX] = paths[D_USER_IDX] + GAMECONFIG_DIR DIR_SEP;
720 paths[D_MAPS_IDX] = paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
721 paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
722 paths[D_SHADERCACHE_IDX] = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
723 paths[D_SHADERS_IDX] = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP;
724 paths[D_STATESAVES_IDX] = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP;
725 paths[D_SCREENSHOTS_IDX] = paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP;
726 paths[D_DUMP_IDX] = paths[D_USER_IDX] + DUMP_DIR DIR_SEP;
727 paths[D_DUMPFRAMES_IDX] = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
728 paths[D_DUMPAUDIO_IDX] = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
729 paths[D_DUMPTEXTURES_IDX] = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
730 paths[D_LOGS_IDX] = paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
731 paths[D_SYSCONF_IDX] = paths[D_USER_IDX] + SYSCONF_DIR DIR_SEP;
732 paths[F_EMUCONFIG_IDX] = paths[D_CONFIG_IDX] + EMU_CONFIG;
733 paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
734 paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG;
735 paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG;
736 break;
737
738 case D_CONFIG_IDX:
739 paths[F_EMUCONFIG_IDX] = paths[D_CONFIG_IDX] + EMU_CONFIG;
740 paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
741 paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG;
742 break;
743
744 case D_DUMP_IDX:
745 paths[D_DUMPFRAMES_IDX] = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
746 paths[D_DUMPAUDIO_IDX] = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
747 paths[D_DUMPTEXTURES_IDX] = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
748 break;
749
750 case D_LOGS_IDX:
751 paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG;
752 }
753 }
779 754
780 return dir; 755 return paths[DirIDX];
781} 756}
782 757
758//std::string GetThemeDir(const std::string& theme_name)
759//{
760// std::string dir = File::GetUserPath(D_THEMES_IDX) + theme_name + "/";
761//
762//#if !defined(_WIN32)
763// // If theme does not exist in user's dir load from shared directory
764// if (!File::Exists(dir))
765// dir = SHARED_USER_DIR THEMES_DIR "/" + theme_name + "/";
766//#endif
767//
768// return dir;
769//}
770
783bool WriteStringToFile(bool text_file, const std::string &str, const char *filename) 771bool WriteStringToFile(bool text_file, const std::string &str, const char *filename)
784{ 772{
785 return File::IOFile(filename, text_file ? "w" : "wb").WriteBytes(str.data(), str.size()); 773 return File::IOFile(filename, text_file ? "w" : "wb").WriteBytes(str.data(), str.size());
diff --git a/src/common/src/file_util.h b/src/common/src/file_util.h
index a6bd085ab..f4ef949d8 100644
--- a/src/common/src/file_util.h
+++ b/src/common/src/file_util.h
@@ -18,9 +18,7 @@
18// User directory indices for GetUserPath 18// User directory indices for GetUserPath
19enum { 19enum {
20 D_USER_IDX, 20 D_USER_IDX,
21 D_GCUSER_IDX, 21 D_ROOT_IDX,
22 D_WIIROOT_IDX,
23 D_WIIUSER_IDX,
24 D_CONFIG_IDX, 22 D_CONFIG_IDX,
25 D_GAMECONFIG_IDX, 23 D_GAMECONFIG_IDX,
26 D_MAPS_IDX, 24 D_MAPS_IDX,
@@ -29,7 +27,6 @@ enum {
29 D_SHADERS_IDX, 27 D_SHADERS_IDX,
30 D_STATESAVES_IDX, 28 D_STATESAVES_IDX,
31 D_SCREENSHOTS_IDX, 29 D_SCREENSHOTS_IDX,
32 D_OPENCL_IDX,
33 D_HIRESTEXTURES_IDX, 30 D_HIRESTEXTURES_IDX,
34 D_DUMP_IDX, 31 D_DUMP_IDX,
35 D_DUMPFRAMES_IDX, 32 D_DUMPFRAMES_IDX,
@@ -37,19 +34,14 @@ enum {
37 D_DUMPTEXTURES_IDX, 34 D_DUMPTEXTURES_IDX,
38 D_DUMPDSP_IDX, 35 D_DUMPDSP_IDX,
39 D_LOGS_IDX, 36 D_LOGS_IDX,
40 D_MAILLOGS_IDX, 37 D_SYSCONF_IDX,
41 D_WIISYSCONF_IDX, 38 F_EMUCONFIG_IDX,
42 D_WIIWC24_IDX,
43 D_THEMES_IDX,
44 F_DOLPHINCONFIG_IDX,
45 F_DEBUGGERCONFIG_IDX, 39 F_DEBUGGERCONFIG_IDX,
46 F_LOGGERCONFIG_IDX, 40 F_LOGGERCONFIG_IDX,
47 F_MAINLOG_IDX, 41 F_MAINLOG_IDX,
48 F_WIISYSCONF_IDX,
49 F_RAMDUMP_IDX, 42 F_RAMDUMP_IDX,
50 F_ARAMDUMP_IDX, 43 F_ARAMDUMP_IDX,
51 F_FAKEVMEMDUMP_IDX, 44 F_SYSCONF_IDX,
52 F_GCSRAM_IDX,
53 NUM_PATH_INDICES 45 NUM_PATH_INDICES
54}; 46};
55 47
@@ -124,7 +116,7 @@ bool SetCurrentDir(const std::string &directory);
124const std::string& GetUserPath(const unsigned int DirIDX, const std::string &newPath=""); 116const std::string& GetUserPath(const unsigned int DirIDX, const std::string &newPath="");
125 117
126// probably doesn't belong here 118// probably doesn't belong here
127std::string GetThemeDir(const std::string& theme_name); 119//std::string GetThemeDir(const std::string& theme_name);
128 120
129// Returns the path to where the sys file are 121// Returns the path to where the sys file are
130std::string GetSysDirectory(); 122std::string GetSysDirectory();
HIC SVNT DRACONES