zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 15:22:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- force CMake to use internal asmjit. I left it in a state so that it can easily be changed back in the future.

Browse source
This commit is contained in:
Rachael Alexanderson 2019-01-02 08:19:03 -05:00
parent 8cfbc75a4a
commit dbc03a9f9d
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -163,7 +163,10 @@ option( NO_OPENAL "Disable OpenAL sound support" OFF )
find_package( BZip2 ) find_package( BZip2 )
find_package( JPEG ) find_package( JPEG )
find_package( ZLIB ) 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 # GME
find_path( GME_INCLUDE_DIR gme/gme.h ) find_path( GME_INCLUDE_DIR gme/gme.h )
find_library( GME_LIBRARIES gme ) 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_JPEG "Use internal jpeg")
option(FORCE_INTERNAL_BZIP2 "Use internal bzip2") option(FORCE_INTERNAL_BZIP2 "Use internal bzip2")
option(FORCE_INTERNAL_GME "Use internal gme") 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 # Fast math flags, required by some subprojects
set( ZD_FASTMATH_FLAG "" ) set( ZD_FASTMATH_FLAG "" )