- Fixed: src/CMakeLists.txt did not pass -DNOASM to the compiler when assembly

is disabled.



SVN r1156 (trunk)
This commit is contained in:
Randy Heit 2008-08-11 22:29:09 +00:00
parent c02253eef2
commit a876ba55bd

View file

@ -350,7 +350,9 @@ else( WIN32 )
sdl/st_start.cpp ) sdl/st_start.cpp )
endif( WIN32 ) endif( WIN32 )
if( NOT NO_ASM ) if( NO_ASM )
add_definitions( -DNOASM )
else( NO_ASM )
if( X64 ) if( X64 )
ADD_ASM_FILE( asm_x86_64 tmap3 ) ADD_ASM_FILE( asm_x86_64 tmap3 )
else( X64 ) else( X64 )
@ -365,7 +367,7 @@ if( NOT NO_ASM )
ADD_ASM_FILE( win32/wrappers.asm ) ADD_ASM_FILE( win32/wrappers.asm )
endif( NOT X64 ) endif( NOT X64 )
endif( WIN32 ) endif( WIN32 )
endif( NOT NO_ASM ) endif( NO_ASM )
add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.c ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.h add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.c ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.h
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/xlat/xlat_parser.y . COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/xlat/xlat_parser.y .