diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf8e28c4f..4c56ba316 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,23 +110,25 @@ if(ENABLE_LUAJIT)
 endif()
 
 # Check for x64
-if (CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "x86-64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-    set(HOST_X64 TRUE)
-    add_subdirectory(third_party/xbyak) # Add xbyak submodule for x86 JITs
-    include_directories(third_party/xbyak)
-    add_compile_definitions(PANDA3DS_DYNAPICA_SUPPORTED)
-    add_compile_definitions(PANDA3DS_X64_HOST)
-else()
-    set(HOST_X64 FALSE)
-endif()
+# if (CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "x86-64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+#     set(HOST_X64 TRUE)
+#     add_subdirectory(third_party/xbyak) # Add xbyak submodule for x86 JITs
+#     include_directories(third_party/xbyak)
+#     add_compile_definitions(PANDA3DS_DYNAPICA_SUPPORTED)
+#     add_compile_definitions(PANDA3DS_X64_HOST)
+# else()
+#     set(HOST_X64 FALSE)
+# endif()
 
 # Check for arm64
-if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-    set(HOST_ARM64 TRUE)
-    add_compile_definitions(PANDA3DS_ARM64_HOST)
-else()
-    set(HOST_ARM64 FALSE)
-endif()
+set(HOST_ARM64 TRUE)
+add_compile_definitions(PANDA3DS_ARM64_HOST)
+# if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+#     set(HOST_ARM64 TRUE)
+#     add_compile_definitions(PANDA3DS_ARM64_HOST)
+# else()
+#     set(HOST_ARM64 FALSE)
+# endif()
 
 if(HOST_X64 OR HOST_ARM64)
     set(DYNARMIC_TESTS OFF)
diff --git a/third_party/cryptopp/CMakeLists.txt b/third_party/cryptopp/CMakeLists.txt
index 9c4100505..9b378c628 100644
--- a/third_party/cryptopp/CMakeLists.txt
+++ b/third_party/cryptopp/CMakeLists.txt
@@ -278,7 +278,7 @@ set(cryptopp_SOURCES
         ${SRC_DIR}/base64.cpp
         ${SRC_DIR}/basecode.cpp
         ${SRC_DIR}/ccm.cpp
-        ${SRC_DIR}/crc_simd.cpp
+        ${SRC_DIR}/crc.cpp
         ${SRC_DIR}/des.cpp
         ${SRC_DIR}/dessp.cpp
         ${SRC_DIR}/dll.cpp
@@ -286,8 +286,7 @@ set(cryptopp_SOURCES
         ${SRC_DIR}/ecp.cpp
         ${SRC_DIR}/filters.cpp
         ${SRC_DIR}/fips140.cpp
-        ${SRC_DIR}/gcm_simd.cpp
-        ${SRC_DIR}/gf2n_simd.cpp
+        ${SRC_DIR}/gcm.cpp
         ${SRC_DIR}/gf2n.cpp
         ${SRC_DIR}/gfpcrypt.cpp
         ${SRC_DIR}/hex.cpp
@@ -299,23 +298,18 @@ set(cryptopp_SOURCES
         ${SRC_DIR}/modes.cpp
         ${SRC_DIR}/mqueue.cpp
         ${SRC_DIR}/nbtheory.cpp
-        ${SRC_DIR}/neon_simd.cpp
         ${SRC_DIR}/oaep.cpp
         ${SRC_DIR}/osrng.cpp
         ${SRC_DIR}/power7_ppc.cpp
         ${SRC_DIR}/power8_ppc.cpp
         ${SRC_DIR}/power9_ppc.cpp
-        ${SRC_DIR}/ppc_simd.cpp
         ${SRC_DIR}/pubkey.cpp
         ${SRC_DIR}/queue.cpp
         ${SRC_DIR}/randpool.cpp
         ${SRC_DIR}/rdtables.cpp
-        ${SRC_DIR}/rijndael_simd.cpp
         ${SRC_DIR}/rijndael.cpp
         ${SRC_DIR}/rng.cpp
-        ${SRC_DIR}/sha_simd.cpp
         ${SRC_DIR}/sha.cpp
-        ${SRC_DIR}/sse_simd.cpp
         )
 
 if(ANDROID)