mirror of https://github.com/axmolengine/axmol.git
Rename jpeg-turbo folder
This commit is contained in:
parent
7e1db178ab
commit
0465664ea1
|
@ -146,7 +146,7 @@ if(AX_WITH_JPEG)
|
|||
# set(JTURBO_BUILD_TESTS FALSE CACHE BOOL "Build TurboJPEG tests and examples" FORCE)
|
||||
# set(JTURBO_BUILD_BINARIES FALSE CACHE BOOL "Build TurboJPEG binaries" FORCE)
|
||||
# set(WITH_CRT_DLL TRUE CACHE BOOL "Build TurboJPEG with crt dll" FORCE)
|
||||
add_subdirectory(jpeg)
|
||||
add_subdirectory(jpeg-turbo)
|
||||
# configure_target_outdir(jpeg)
|
||||
# configure_target_outdir(simd)
|
||||
# if(TARGET simd-objs)
|
||||
|
@ -155,7 +155,7 @@ if(AX_WITH_JPEG)
|
|||
# if(TARGET jsimdcfg)
|
||||
# configure_target_outdir(jsimdcfg)
|
||||
# endif()
|
||||
target_link_libraries(thirdparty dep_jpeg)
|
||||
target_link_libraries(thirdparty dep_jpeg-turbo)
|
||||
# target_include_directories(thirdparty INTERFACE
|
||||
# "${CMAKE_CURRENT_LIST_DIR}/jpeg"
|
||||
# "${JPEG_CONFIG_OUT_DIR}")
|
||||
|
|
|
@ -90,7 +90,7 @@
|
|||
- Version: v4.0.0
|
||||
- License: MIT-like
|
||||
|
||||
## jpeg (libjpeg-turbo)
|
||||
## jpeg-turbo
|
||||
- Upstream: https://github.com/libjpeg-turbo/libjpeg-turbo
|
||||
- Version: 2.1.3
|
||||
- License: BSD-style (IJG,BSD-3-Clause,zlib)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
set(lib_name jpeg)
|
||||
set(lib_name jpeg-turbo)
|
||||
set(target_name dep_${lib_name})
|
||||
|
||||
project(${lib_name})
|
Loading…
Reference in New Issue