From dbc03a9f9dfdcb1ec886aad63525d891a9636164 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Wed, 2 Jan 2019 08:19:03 -0500 Subject: [PATCH] - force CMake to use internal asmjit. I left it in a state so that it can easily be changed back in the future. --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cc988c737..28ed1482ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,7 +163,10 @@ option( NO_OPENAL "Disable OpenAL sound support" OFF ) find_package( BZip2 ) find_package( JPEG ) find_package( ZLIB ) -find_package( asmjit ) +# find_package( asmjit ) + # no, we're not using external asmjit for now, we made too many modifications to our's. + # if the asmjit author uses our changes then we'll update this. + # GME find_path( GME_INCLUDE_DIR gme/gme.h ) find_library( GME_LIBRARIES gme ) @@ -272,7 +275,8 @@ option(FORCE_INTERNAL_ZLIB "Use internal zlib") option(FORCE_INTERNAL_JPEG "Use internal jpeg") option(FORCE_INTERNAL_BZIP2 "Use internal bzip2") option(FORCE_INTERNAL_GME "Use internal gme") -option(FORCE_INTERNAL_ASMJIT "Use internal asmjit") +option(FORCE_INTERNAL_ASMJIT "Use internal asmjit" ON) +mark_as_advanced( FORCE_INTERNAL_ASMJIT ) # Fast math flags, required by some subprojects set( ZD_FASTMATH_FLAG "" )