Merge pull request #3450 from fr500/master

windows build fix
This commit is contained in:
Twinaphex 2016-08-28 06:04:49 +02:00 committed by GitHub
commit 6f1547c1df
4 changed files with 26 additions and 24 deletions

View File

@ -69,13 +69,13 @@ This option is only available if RetroArch is compiled with dynamic libretro loa
.TP
\fB--save PATH, -s PATH\fR
Overrides the path used for save ram (*.srm).
Overrides the path used for save ram (*.srm) (deprecated).
Without this flag, the save ram path will be inferred from the rom path name, and put in the same directory as the rom file with the extension replaced with '.srm'.
If PATH is a directory, RetroArch will treat this as the save file directory, where the save file name will be inferred from the rom name.
.TP
\fB--savestate PATH, -S PATH\fR
Overrides the path used for save states.
Overrides the path used for save states (deprecated).
Without this flag, the save state path will be inferred from the rom path name, and put in the same directory as the rom file with the extension replace with '.state'.
If PATH is a directory, RetroArch will treat this as the save state directory, where the state file name will be inferred from the rom name.
Do note that save states are bound to the libretro implementation being used. Using a different libretro could invalidate the save state file.

View File

@ -59,25 +59,6 @@
#include <retro_stat.h>
#include <retro_dirent.h>
struct RDIR
{
#if defined(_WIN32)
WIN32_FIND_DATA entry;
HANDLE directory;
bool next;
#elif defined(VITA) || defined(PSP)
SceUID directory;
SceIoDirent entry;
#elif defined(__CELLOS_LV2__)
CellFsErrno error;
int directory;
CellFsDirent entry;
#else
DIR *directory;
const struct dirent *entry;
#endif
};
struct RDIR *retro_opendir(const char *name)
{
#if defined(_WIN32)

View File

@ -29,7 +29,24 @@
RETRO_BEGIN_DECLS
struct RDIR;
struct RDIR
{
#if defined(_WIN32)
WIN32_FIND_DATA entry;
HANDLE directory;
bool next;
#elif defined(VITA) || defined(PSP)
SceUID directory;
SceIoDirent entry;
#elif defined(__CELLOS_LV2__)
CellFsErrno error;
int directory;
CellFsDirent entry;
#else
DIR *directory;
const struct dirent *entry;
#endif
};
struct RDIR *retro_opendir(const char *name);

View File

@ -22,6 +22,10 @@
#include <stdlib.h>
#ifdef _WIN32
#include <windows.h>
#endif
#include <lists/dir_list.h>
#include <lists/string_list.h>
#include <file/file_path.h>
@ -211,9 +215,9 @@ int dir_list_read(const char *dir, struct string_list *list, struct string_list
#ifdef _WIN32
if (include_hidden)
entry.dwFileAttributes |= FILE_ATTRIBUTE_HIDDEN;
entry->entry.dwFileAttributes |= FILE_ATTRIBUTE_HIDDEN;
else
entry.dwFileAttributes &= ~FILE_ATTRIBUTE_HIDDEN;
entry->entry.dwFileAttributes &= ~FILE_ATTRIBUTE_HIDDEN;
#endif
while (retro_readdir(entry))