From d789b2da3624dfb7637825efdc1e6258b26bb120 Mon Sep 17 00:00:00 2001 From: Sacha Date: Thu, 11 Apr 2013 15:14:44 +1000 Subject: [PATCH] Qt has these in-built. No need for VFS. --- UI/NativeApp.cpp | 2 ++ native | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index ff9c3111b4..da26fd2d33 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -183,6 +183,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co std::string user_data_path = savegame_directory; isMessagePending = false; // We want this to be FIRST. +#ifndef USING_QT_UI #ifdef BLACKBERRY // Packed assets are included in app/native/ dir VFSRegister("", new DirectoryAssetReader("app/native/assets/")); @@ -202,6 +203,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co VFSRegister("", new DirectoryAssetReader("assets/")); #endif VFSRegister("", new DirectoryAssetReader(user_data_path.c_str())); +#endif host = new NativeHost(); diff --git a/native b/native index c0963ec11f..9c96dcea91 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit c0963ec11fd57f2bd3d389464b3e1455bbc5a6a4 +Subproject commit 9c96dcea91f6d4237e878c9d1b004e3e1e9678d7