Allow nasm path to be overridden

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@262 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2010-10-15 08:39:44 +00:00
parent a9d5b25304
commit cd5f2ee23c

View File

@@ -1,3 +1,7 @@
if(NOT DEFINED NASM)
set(NASM nasm)
endif()
if(SIMD_X86_64)
set(NAFLAGS -fwin64 -DWIN64 -D__x86_64__ -I${CMAKE_SOURCE_DIR}/win/
-I${CMAKE_CURRENT_SOURCE_DIR}/)
@@ -41,7 +45,7 @@ foreach(file ${SIMD_BASENAMES})
set(SIMD_SRC ${CMAKE_CURRENT_SOURCE_DIR}/${file}.asm)
set(SIMD_OBJ ${OBJDIR}/${file}.obj)
add_custom_command(OUTPUT ${SIMD_OBJ} DEPENDS ${SIMD_SRC} *.inc
COMMAND nasm ${NAFLAGS} ${SIMD_SRC} -o${SIMD_OBJ})
COMMAND ${NASM} ${NAFLAGS} ${SIMD_SRC} -o${SIMD_OBJ})
set(SIMD_OBJS ${SIMD_OBJS} ${SIMD_OBJ})
endforeach()