diff --git a/Core/Config.cpp b/Core/Config.cpp index e710c3f36f..07e65cea85 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -31,7 +31,9 @@ #include "Config.h" #include "HLE/sceUtility.h" +#ifndef USING_QT_UI extern const char *PPSSPP_GIT_VERSION; +#endif // TODO: Find a better place for this. http::Downloader g_DownloadManager; diff --git a/Qt/Native.pro b/Qt/Native.pro index b46b7a5f20..cf68f01ea6 100755 --- a/Qt/Native.pro +++ b/Qt/Native.pro @@ -51,6 +51,14 @@ SOURCES += $$P/ext/snappy/*.cpp HEADERS += $$P/ext/snappy/*.h INCLUDEPATH += $$P/ext/snappy +# VJSON + +SOURCES += $$P/native/ext/vjson/json.cpp \ + $$P/native/ext/vjson/block_allocator.cpp +HEADERS += $$P/native/ext/vjson/json.h \ + $$P/native/ext/vjson/block_allocator.h +INCLUDEPATH += $$P/native/ext/vjson + # Zlib win32|contains(QT_CONFIG, no-zlib) { SOURCES += $$P/ext/zlib/*.c diff --git a/native b/native index 17ddae23cc..7744fdc5db 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 17ddae23cceda928777cf253101dc78a6da502d4 +Subproject commit 7744fdc5db03ff80be97d32c34a4a61f0191e829