mirror of
https://github.com/libjpeg-turbo/libjpeg-turbo.git
synced 2026-01-18 21:41:20 +01:00
Build/CI: Officially support Windows/Arm
- Use Visual Studio 2022 for CI builds. - Rename installers to clearly distinguish x86, x64, and Arm64 versions. NOTE: The Windows/Arm installer uses the same internal name and install directory as the Windows/x64 installer. That is consistent with the behavior of the Linux packages. Because the installer places turbojpeg.dll into C:\WINDOWS\System32, it would normally be impossible to co-install the x64 and Arm64 versions anyhow. (That can still be accomplished. You just have to use 7-Zip to extract one of the installers into a non-default directory.)
This commit is contained in:
@@ -81,9 +81,17 @@ endif()
|
||||
|
||||
if(BITS EQUAL 64)
|
||||
set(INST_PLATFORM "${INST_PLATFORM} 64-bit")
|
||||
set(INST_NAME ${INST_NAME}64)
|
||||
if(CPU_TYPE STREQUAL "arm64")
|
||||
set(INST_NAME ${INST_NAME}-arm64)
|
||||
elseif(CPU_TYPE STREQUAL "x86_64")
|
||||
set(INST_NAME ${INST_NAME}-x64)
|
||||
else()
|
||||
set(INST_NAME ${INST_NAME}64)
|
||||
endif()
|
||||
set(INST_REG_NAME ${INST_REG_NAME}64)
|
||||
set(INST_DEFS ${INST_DEFS} -DWIN64)
|
||||
elseif(CPU_TYPE STREQUAL "i386")
|
||||
set(INST_NAME ${INST_NAME}-x86)
|
||||
endif()
|
||||
|
||||
if(WITH_JAVA)
|
||||
|
||||
Reference in New Issue
Block a user