merge 3rdparty libraries

.gitmodules

@@ -27,97 +27,97 @@
 	url = ../../RPCS3/ffmpeg-core.git
 	ignore = dirty
 [submodule "rpcs3/asmjit"]
-	path = rpcs3/3rdparty/asmjit/asmjit
+	path = 3rdparty/asmjit/asmjit
 	url = ../../asmjit/asmjit.git
 	branch = master
 	ignore = dirty
 [submodule "rpcs3/3rdparty/llvm/llvm"]
-	path = rpcs3/3rdparty/llvm/llvm
+	path = 3rdparty/llvm/llvm
 	url = ../../llvm/llvm-project.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/zlib"]
-	path = rpcs3/3rdparty/zlib/zlib
+	path = 3rdparty/zlib/zlib
 	url = ../../madler/zlib
 	ignore = dirty
 [submodule "rpcs3/3rdparty/hidapi"]
-	path = rpcs3/3rdparty/hidapi/hidapi
+	path = 3rdparty/hidapi/hidapi
 	url = ../../RPCS3/hidapi.git
 	branch = master
 	ignore = dirty
 [submodule "rpcs3/3rdparty/pugixml"]
-	path = rpcs3/3rdparty/pugixml
+	path = 3rdparty/pugixml
 	url = ../../zeux/pugixml.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/yaml-cpp"]
-	path = rpcs3/3rdparty/yaml-cpp/yaml-cpp
+	path = 3rdparty/yaml-cpp/yaml-cpp
 	url = ../../RPCS3/yaml-cpp.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/libpng"]
-	path = rpcs3/3rdparty/libpng/libpng
+	path = 3rdparty/libpng/libpng
 	url = ../../glennrp/libpng.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/libusb"]
-	path = rpcs3/3rdparty/libusb/libusb
+	path = 3rdparty/libusb/libusb
 	url = ../../libusb/libusb.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/FAudio"]
-	path = rpcs3/3rdparty/FAudio
+	path = 3rdparty/FAudio
 	url = ../../FNA-XNA/FAudio.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/curl"]
-	path = rpcs3/3rdparty/curl/curl
+	path = 3rdparty/curl/curl
 	url = ../../curl/curl.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/wolfssl"]
-	path = rpcs3/3rdparty/wolfssl/wolfssl
+	path = 3rdparty/wolfssl/wolfssl
 	url = ../../wolfSSL/wolfssl.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/flatbuffers"]
-	path = rpcs3/3rdparty/flatbuffers
+	path = 3rdparty/flatbuffers
 	url = ../../google/flatbuffers.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/cubeb/cubeb"]
-	path = rpcs3/3rdparty/cubeb/cubeb
+	path = 3rdparty/cubeb/cubeb
 	url = ../../mozilla/cubeb.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/SoundTouch/soundtouch"]
-	path = rpcs3/3rdparty/SoundTouch/soundtouch
+	path = 3rdparty/SoundTouch/soundtouch
 	url = ../../RPCS3/soundtouch.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/libsdl-org/SDL"]
-	path = rpcs3/3rdparty/libsdl-org/SDL
+	path = 3rdparty/libsdl-org/SDL
 	url = ../../libsdl-org/SDL.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/miniupnp/miniupnp"]
-	path = rpcs3/3rdparty/miniupnp/miniupnp
+	path = 3rdparty/miniupnp/miniupnp
 	url = ../../miniupnp/miniupnp.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/rtmidi/rtmidi"]
-	path = rpcs3/3rdparty/rtmidi/rtmidi
+	path = 3rdparty/rtmidi/rtmidi
 	url = ../../thestk/rtmidi
 	ignore = dirty
 [submodule "rpcs3/3rdparty/zstd/zstd"]
-	path = rpcs3/3rdparty/zstd/zstd
+	path = 3rdparty/zstd/zstd
 	url = ../../facebook/zstd
 	ignore = dirty
 [submodule "rpcs3/3rdparty/7zip/7zip"]
-	path = rpcs3/3rdparty/7zip/7zip
+	path = 3rdparty/7zip/7zip
 	url = ../../ip7z/7zip.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/OpenAL/openal-soft"]
-	path = rpcs3/3rdparty/OpenAL/openal-soft
+	path = 3rdparty/OpenAL/openal-soft
 	url = ../../kcat/openal-soft.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/stblib/stb"]
-	path = rpcs3/3rdparty/stblib/stb
+	path = 3rdparty/stblib/stb
 	url = ../../nothings/stb.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/opencv/opencv"]
-	path = rpcs3/3rdparty/opencv/opencv
+	path = 3rdparty/opencv/opencv
 	url = ../../Megamouse/opencv_minimal.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/fusion/fusion"]
-	path = rpcs3/3rdparty/fusion/fusion
+	path = 3rdparty/fusion/fusion
 	url = ../../xioTechnologies/Fusion.git
 	ignore = dirty
 [submodule "rpcs3/3rdparty/discord-rpc/discord-rpc"]
@@ -125,15 +125,11 @@
 	url = ../../Vestrel/discord-rpc
 	ignore = dirty
 [submodule "rpcs3/3rdparty/GPUOpen/VulkanMemoryAllocator"]
-	path = rpcs3/3rdparty/GPUOpen/VulkanMemoryAllocator
+	path = 3rdparty/GPUOpen/VulkanMemoryAllocator
 	url = ../../Megamouse/VulkanMemoryAllocator.git
 	ignore = dirty
-[submodule "rpcs3/3rdparty/json"]
-	path = rpcs3/3rdparty/json
-	url = ../../nlohmann/json.git
-	ignore = dirty
 [submodule "3rdparty/libadrenotools"]
-	path = rpcs3/3rdparty/libadrenotools
+	path = 3rdparty/libadrenotools
 	url = ../../bylaws/libadrenotools.git
 [submodule "3rdparty/Vulkan-Headers"]
 	path = 3rdparty/Vulkan-Headers