VFS: Fix some minor VFile issues with FILEs

mgba-emu · Jan 12, 2017 · d20e64f · d20e64f
1 parent dc96bdd
commit d20e64f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -45,6 +45,7 @@ Misc:
  - Qt: Expose configuration directory
  - Feature: Move game database from flatfile to SQLite3
  - GB Audio: Start implementing "zombie" audio (fixes mgba.io/i/389)
+ - VFS: Fix some minor VFile issues with FILEs
 
 0.5.2: (2016-12-31)
 Bugfixes:

diff --git a/include/mgba-util/vfs.h b/include/mgba-util/vfs.h
@@ -85,9 +85,12 @@ struct VDir* VDirOpen7z(const char* path, int flags);
 #endif
 
 #if defined(__wii__) || defined(_3DS)
+struct VDir* VDeviceList(void);
+#endif
+
+#ifdef USE_VFS_FILE
 struct VFile* VFileFOpen(const char* path, const char* mode);
 struct VFile* VFileFromFILE(FILE* file);
-struct VDir* VDeviceList(void);
 #endif
 
 void separatePath(const char* path, char* dirname, char* basename, char* extension);

diff --git a/src/platform/3ds/CMakeLists.txt b/src/platform/3ds/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(USE_VFS_3DS ON CACNE BOOL "Use 3DS-specific file support")
+set(USE_VFS_3DS ON CACHE BOOL "Use 3DS-specific file support")
 mark_as_advanced(USE_VFS_3DS)
 
 find_program(3DSLINK 3dslink)