mirror of https://github.com/ZDoom/gzdoom.git
- moved third party library projects to a subfolder to reduce size of the root.
This commit is contained in:
Christoph Oelckers
parent
ec52e90e54
commit
ed6ab39b2d
|
|
@ -300,9 +300,9 @@ option(FORCE_INTERNAL_ASMJIT "Use internal asmjit" ON)
|
||||||
mark_as_advanced( FORCE_INTERNAL_ASMJIT )
|
mark_as_advanced( FORCE_INTERNAL_ASMJIT )
|
||||||
|
|
||||||
if (HAVE_VULKAN)
|
if (HAVE_VULKAN)
|
||||||
add_subdirectory( glslang/glslang)
|
add_subdirectory( libraries/glslang/glslang)
|
||||||
add_subdirectory( glslang/spirv )
|
add_subdirectory( libraries/glslang/spirv )
|
||||||
add_subdirectory( glslang/OGLCompilersDLL )
|
add_subdirectory( libraries/glslang/OGLCompilersDLL )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Fast math flags, required by some subprojects
|
# Fast math flags, required by some subprojects
|
||||||
|
|
@ -318,8 +318,8 @@ if( ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB )
|
||||||
else()
|
else()
|
||||||
message( STATUS "Using internal zlib" )
|
message( STATUS "Using internal zlib" )
|
||||||
set( SKIP_INSTALL_ALL TRUE ) # Avoid installing zlib alongside zdoom
|
set( SKIP_INSTALL_ALL TRUE ) # Avoid installing zlib alongside zdoom
|
||||||
add_subdirectory( zlib )
|
add_subdirectory( libraries/zlib )
|
||||||
set( ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/zlib )
|
set( ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libraries/zlib )
|
||||||
set( ZLIB_LIBRARIES z )
|
set( ZLIB_LIBRARIES z )
|
||||||
set( ZLIB_LIBRARY z )
|
set( ZLIB_LIBRARY z )
|
||||||
endif()
|
endif()
|
||||||
|
|
@ -343,8 +343,8 @@ if( ${HAVE_VM_JIT} )
|
||||||
else()
|
else()
|
||||||
message( STATUS "Using internal asmjit" )
|
message( STATUS "Using internal asmjit" )
|
||||||
set( SKIP_INSTALL_ALL TRUE ) # Avoid installing asmjit alongside zdoom
|
set( SKIP_INSTALL_ALL TRUE ) # Avoid installing asmjit alongside zdoom
|
||||||
add_subdirectory( asmjit )
|
add_subdirectory( libraries/asmjit )
|
||||||
set( ASMJIT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/asmjit )
|
set( ASMJIT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libraries/asmjit )
|
||||||
set( ASMJIT_LIBRARIES asmjit )
|
set( ASMJIT_LIBRARIES asmjit )
|
||||||
set( ASMJIT_LIBRARY asmjit )
|
set( ASMJIT_LIBRARY asmjit )
|
||||||
endif()
|
endif()
|
||||||
|
|
@ -354,8 +354,8 @@ if( JPEG_FOUND AND NOT FORCE_INTERNAL_JPEG )
|
||||||
message( STATUS "Using system jpeg library, includes found at ${JPEG_INCLUDE_DIR}" )
|
message( STATUS "Using system jpeg library, includes found at ${JPEG_INCLUDE_DIR}" )
|
||||||
else()
|
else()
|
||||||
message( STATUS "Using internal jpeg library" )
|
message( STATUS "Using internal jpeg library" )
|
||||||
add_subdirectory( jpeg )
|
add_subdirectory( libraries/jpeg )
|
||||||
set( JPEG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jpeg )
|
set( JPEG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libraries/jpeg )
|
||||||
set( JPEG_LIBRARIES jpeg )
|
set( JPEG_LIBRARIES jpeg )
|
||||||
set( JPEG_LIBRARY jpeg )
|
set( JPEG_LIBRARY jpeg )
|
||||||
endif()
|
endif()
|
||||||
|
|
@ -364,8 +364,8 @@ if( BZIP2_FOUND AND NOT FORCE_INTERNAL_BZIP2 )
|
||||||
message( STATUS "Using system bzip2 library, includes found at ${BZIP2_INCLUDE_DIR}" )
|
message( STATUS "Using system bzip2 library, includes found at ${BZIP2_INCLUDE_DIR}" )
|
||||||
else()
|
else()
|
||||||
message( STATUS "Using internal bzip2 library" )
|
message( STATUS "Using internal bzip2 library" )
|
||||||
add_subdirectory( bzip2 )
|
add_subdirectory( libraries/bzip2 )
|
||||||
set( BZIP2_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/bzip2" )
|
set( BZIP2_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/bzip2" )
|
||||||
set( BZIP2_LIBRARIES bz2 )
|
set( BZIP2_LIBRARIES bz2 )
|
||||||
set( BZIP2_LIBRARY bz2 )
|
set( BZIP2_LIBRARY bz2 )
|
||||||
endif()
|
endif()
|
||||||
|
|
@ -377,12 +377,12 @@ else()
|
||||||
# Use MAME as it's balanced emulator: well-accurate, but doesn't eats lot of CPU
|
# Use MAME as it's balanced emulator: well-accurate, but doesn't eats lot of CPU
|
||||||
# Nuked OPN2 is very accurate emulator, but it eats too much CPU for the workflow
|
# Nuked OPN2 is very accurate emulator, but it eats too much CPU for the workflow
|
||||||
set( GME_YM2612_EMU "MAME" )
|
set( GME_YM2612_EMU "MAME" )
|
||||||
add_subdirectory( game-music-emu )
|
add_subdirectory( libraries/game-music-emu )
|
||||||
set( GME_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/game-music-emu" )
|
set( GME_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/game-music-emu" )
|
||||||
set( GME_LIBRARIES gme )
|
set( GME_LIBRARIES gme )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lzma/C" )
|
set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/lzma/C" )
|
||||||
|
|
||||||
if( NOT CMAKE_CROSSCOMPILING )
|
if( NOT CMAKE_CROSSCOMPILING )
|
||||||
if( NOT CROSS_EXPORTS )
|
if( NOT CROSS_EXPORTS )
|
||||||
|
|
@ -400,10 +400,10 @@ install(DIRECTORY docs/
|
||||||
DESTINATION ${INSTALL_DOCS_PATH}
|
DESTINATION ${INSTALL_DOCS_PATH}
|
||||||
COMPONENT "Documentation")
|
COMPONENT "Documentation")
|
||||||
|
|
||||||
add_subdirectory( lzma )
|
add_subdirectory( libraries/lzma )
|
||||||
add_subdirectory( tools )
|
add_subdirectory( tools )
|
||||||
add_subdirectory( dumb )
|
add_subdirectory( libraries/dumb )
|
||||||
add_subdirectory( gdtoa )
|
add_subdirectory( libraries/gdtoa )
|
||||||
add_subdirectory( wadsrc )
|
add_subdirectory( wadsrc )
|
||||||
add_subdirectory( wadsrc_bm )
|
add_subdirectory( wadsrc_bm )
|
||||||
add_subdirectory( wadsrc_lights )
|
add_subdirectory( wadsrc_lights )
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue