Fix wrong rapidjson include on Appveyor

appveyor.yml

@@ -90,7 +90,7 @@ install:
   # Configuring MSys2
   - set PATH=C:\msys64\usr\bin;%PATH%
   - set PATH=C:\msys64\mingw32\bin;%PATH%
-  - pacman --noconfirm -S mingw-w64-i686-qt5 mingw-w64-i686-miniupnpc mingw-w64-i686-sqlcipher mingw-w64-i686-libmicrohttpd mingw-w64-i686-xapian-core mingw-w64-i686-cmark
+  - pacman --noconfirm -S mingw-w64-i686-qt5 mingw-w64-i686-miniupnpc mingw-w64-i686-rapidjson mingw-w64-i686-sqlcipher mingw-w64-i686-xapian-core mingw-w64-i686-cmark
   #- pacman --noconfirm -S mingw-w64-i686-qt5-static mingw-w64-i686-miniupnpc mingw-w64-i686-sqlcipher mingw-w64-i686-libmicrohttpd
   #- set PATH=C:\msys64\mingw32\qt5-static\bin\;%PATH%
 

libretroshare/src/serialiser/rstypeserializer.cc

@@ -32,12 +32,7 @@
 #include <iomanip>
 #include <string>
 #include <typeinfo> // for typeid
-
-#ifdef HAS_RAPIDJSON
 #include <rapidjson/prettywriter.h>
-#else
-#include <rapid_json/prettywriter.h>
-#endif // HAS_RAPIDJSON
 
 static constexpr uint32_t MAX_SERIALIZED_CHUNK_SIZE = 10*1024*1024 ; // 10 MB.
 

libretroshare/src/use_libretroshare.pri

@@ -38,11 +38,10 @@ bitdht {
 # always possible to find them
 RAPIDJSON_AVAILABLE = $$system(pkg-config --atleast-version 1.1 RapidJSON && echo yes)
 isEmpty(RAPIDJSON_AVAILABLE) {
-    message("using built-in rapidjson")
+    message("using rapidjson from submodule")
     INCLUDEPATH *= $$clean_path($${PWD}/../../supportlibs/rapidjson/include)
 } else {
     message("using system rapidjson")
-    DEFINES *= HAS_RAPIDJSON
 }
 
 

libretroshare/src/util/rsjson.cc

@@ -19,19 +19,12 @@
  *                                                                             *
  *******************************************************************************/
 
+#include <rapidjson/writer.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/prettywriter.h>
+
 #include "util/rsjson.h"
 
-#ifdef HAS_RAPIDJSON
-#	include <rapidjson/writer.h>
-#	include <rapidjson/stringbuffer.h>
-#	include <rapidjson/prettywriter.h>
-#else
-#	include <rapid_json/writer.h>
-#	include <rapid_json/stringbuffer.h>
-#	include <rapid_json/prettywriter.h>
-#endif // HAS_RAPIDJSON
-
-
 inline int getJsonManipulatorStatePosition()
 {
 	static int p = std::ios_base::xalloc();

libretroshare/src/util/rsjson.h

@@ -21,12 +21,7 @@
 #pragma once
 
 #include <iostream>
-
-#ifdef HAS_RAPIDJSON
-#	include <rapidjson/document.h>
-#else
-#	include <rapid_json/document.h>
-#endif // HAS_RAPIDJSON
+#include <rapidjson/document.h>
 
 /**
  * Use this type for JSON documents representations in RetroShare code