diff --git a/.gitmodules b/.gitmodules
index 44d82333b5..6687ec1553 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -77,6 +77,3 @@
 	path = waterbox/gpgx/Genesis-Plus-GX
 	url = https://github.com/TASEmulators/Genesis-Plus-GX.git
 	branch = tasvideos-2.1
-[submodule "ExternalProjects/libchdr/libchdr"]
-	path = ExternalProjects/libchdr/libchdr
-	url = https://github.com/rtissera/libchdr.git
diff --git a/Assets/dll/libchd_capi.so b/Assets/dll/libchd_capi.so
new file mode 100755
index 0000000000..177f474331
Binary files /dev/null and b/Assets/dll/libchd_capi.so differ
diff --git a/ExternalProjects/libchdr/.gitignore b/ExternalProjects/libchdr/.gitignore
deleted file mode 100644
index 3722ac63ca..0000000000
--- a/ExternalProjects/libchdr/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build/
diff --git a/ExternalProjects/libchdr/build_release.bat b/ExternalProjects/libchdr/build_release.bat
deleted file mode 100644
index 06625b160a..0000000000
--- a/ExternalProjects/libchdr/build_release.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-rmdir /s /q build
-mkdir build
-cd build
-:: cl must be used as clang fails to compile :(
-cmake ..\libchdr -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=cl -G Ninja ^
-	-DBUILD_LTO=ON -DBUILD_SHARED_LIBS=ON -DINSTALL_STATIC_LIBS=OFF -DWITH_SYSTEM_ZLIB=OFF
-ninja
-xcopy .\chdr.dll ..\..\..\Assets\dll\ /Y
-xcopy .\chdr.dll ..\..\..\output\dll\ /Y
-cd ..
diff --git a/ExternalProjects/libchdr/build_release.sh b/ExternalProjects/libchdr/build_release.sh
deleted file mode 100755
index a10465fe4c..0000000000
--- a/ExternalProjects/libchdr/build_release.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-if [ -z "$CC" ]; then export CC="clang"; fi
-
-rm -rf build
-mkdir build
-cd build
-cmake ../libchdr -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=$CC -G Ninja \
-	-DBUILD_LTO=ON -DBUILD_SHARED_LIBS=ON -DINSTALL_STATIC_LIBS=OFF -DWITH_SYSTEM_ZLIB=OFF
-ninja
-cp -t ../../../Assets/dll/ ./libchdr.so
-cp -t ../../../output/dll/ ./libchdr.so
diff --git a/ExternalProjects/libchdr/libchdr b/ExternalProjects/libchdr/libchdr
deleted file mode 160000
index 5c598c2df3..0000000000
--- a/ExternalProjects/libchdr/libchdr
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5c598c2df3a7717552a76410d79f5af01ff51b1d