diff options
author | bunnei <ericbunnie@gmail.com> | 2014-04-09 02:15:08 +0200 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-04-09 02:15:08 +0200 |
commit | de0a034a849f5a1cbe2fed9ef2cc4095c56e672a (patch) | |
tree | c19b7a97fded29a04d7aca5702ab901820a663dc /src/core/file_sys | |
parent | got rid of 'src' folders in each sub-project (diff) | |
download | yuzu-de0a034a849f5a1cbe2fed9ef2cc4095c56e672a.tar yuzu-de0a034a849f5a1cbe2fed9ef2cc4095c56e672a.tar.gz yuzu-de0a034a849f5a1cbe2fed9ef2cc4095c56e672a.tar.bz2 yuzu-de0a034a849f5a1cbe2fed9ef2cc4095c56e672a.tar.lz yuzu-de0a034a849f5a1cbe2fed9ef2cc4095c56e672a.tar.xz yuzu-de0a034a849f5a1cbe2fed9ef2cc4095c56e672a.tar.zst yuzu-de0a034a849f5a1cbe2fed9ef2cc4095c56e672a.zip |
Diffstat (limited to 'src/core/file_sys')
-rw-r--r-- | src/core/file_sys/directory_file_system.cpp | 12 | ||||
-rw-r--r-- | src/core/file_sys/directory_file_system.h | 7 | ||||
-rw-r--r-- | src/core/file_sys/file_sys.h | 4 | ||||
-rw-r--r-- | src/core/file_sys/meta_file_system.cpp | 7 | ||||
-rw-r--r-- | src/core/file_sys/meta_file_system.h | 5 |
5 files changed, 15 insertions, 20 deletions
diff --git a/src/core/file_sys/directory_file_system.cpp b/src/core/file_sys/directory_file_system.cpp index 29369eec4..6c6f33c2b 100644 --- a/src/core/file_sys/directory_file_system.cpp +++ b/src/core/file_sys/directory_file_system.cpp @@ -15,13 +15,11 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "chunk_file.h" -#include "file_util.h" -#include "directory_file_system.h" -//#include "ISOFileSystem.h" -//#include "Core/HLE/sceKernel.h" -//#include "file/zip_read.h" -#include "utf8.h" +#include "common/chunk_file.h" +#include "common/file_util.h" +#include "common/utf8.h" + +#include "core/file_sys/directory_file_system.h" #if EMU_PLATFORM == PLATFORM_WINDOWS #include <windows.h> diff --git a/src/core/file_sys/directory_file_system.h b/src/core/file_sys/directory_file_system.h index a11331a27..9af2854a2 100644 --- a/src/core/file_sys/directory_file_system.h +++ b/src/core/file_sys/directory_file_system.h @@ -15,14 +15,13 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#ifndef CORE_FILE_SYS_DIRECTORY_H_ -#define CORE_FILE_SYS_DIRECTORY_H_ +#pragma once // TODO: Remove the Windows-specific code, FILE is fine there too. #include <map> -#include "file_sys.h" +#include "core/file_sys/file_sys.h" #ifdef _WIN32 typedef void * HANDLE; @@ -154,5 +153,3 @@ private: std::string GetLocalPath(std::string localpath); }; - -#endif // CORE_FILE_SYS_DIRECTORY_H_ diff --git a/src/core/file_sys/file_sys.h b/src/core/file_sys/file_sys.h index b27e36c80..bb8503e62 100644 --- a/src/core/file_sys/file_sys.h +++ b/src/core/file_sys/file_sys.h @@ -17,8 +17,8 @@ #pragma once -#include "common.h" -#include "chunk_file.h" +#include "common/common.h" +#include "common/chunk_file.h" enum FileAccess { FILEACCESS_NONE=0, diff --git a/src/core/file_sys/meta_file_system.cpp b/src/core/file_sys/meta_file_system.cpp index f86c3cb18..01048e498 100644 --- a/src/core/file_sys/meta_file_system.cpp +++ b/src/core/file_sys/meta_file_system.cpp @@ -17,10 +17,9 @@ #include <set> #include <algorithm> -#include "string_util.h" -#include "file_sys/meta_file_system.h" -//#include "Core/HLE/sceKernelThread.h" -//#include "Core/Reporting.h" + +#include "common/string_util.h" +#include "core/file_sys/meta_file_system.h" static bool ApplyPathStringToComponentsVector(std::vector<std::string> &vector, const std::string &pathString) { diff --git a/src/core/file_sys/meta_file_system.h b/src/core/file_sys/meta_file_system.h index 0de23d49c..961f75cda 100644 --- a/src/core/file_sys/meta_file_system.h +++ b/src/core/file_sys/meta_file_system.h @@ -17,8 +17,9 @@ #pragma once -#include "std_mutex.h" -#include "file_sys.h" +#include "common/std_mutex.h" + +#include "core/file_sys/file_sys.h" class MetaFileSystem : public IHandleAllocator, public IFileSystem { |