mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-25 05:21:02 +00:00
Merge branch 'master' of https://github.com/rheit/zdoom
This commit is contained in:
commit
52acaa07a2
2 changed files with 8 additions and 8 deletions
|
@ -357,19 +357,19 @@ if( NOT NO_ASM )
|
||||||
set( ASM_FLAGS -f win32 -DWIN32 -i${CMAKE_CURRENT_SOURCE_DIR}/ )
|
set( ASM_FLAGS -f win32 -DWIN32 -i${CMAKE_CURRENT_SOURCE_DIR}/ )
|
||||||
endif( X64 )
|
endif( X64 )
|
||||||
endif( UNIX )
|
endif( UNIX )
|
||||||
if( WIN32 )
|
if( WIN32 AND NOT X64 )
|
||||||
set( FIXRTEXT fixrtext )
|
set( FIXRTEXT fixrtext )
|
||||||
else( WIN32 )
|
else( WIN32 AND NOT X64 )
|
||||||
set( FIXRTEXT "" )
|
set( FIXRTEXT "" )
|
||||||
endif( WIN32 )
|
endif( WIN32 AND NOT X64 )
|
||||||
message( STATUS "Selected assembler: ${ASSEMBLER}" )
|
message( STATUS "Selected assembler: ${ASSEMBLER}" )
|
||||||
MACRO( ADD_ASM_FILE indir infile )
|
MACRO( ADD_ASM_FILE indir infile )
|
||||||
set( ASM_OUTPUT_${infile} "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/zdoom.dir/${indir}/${infile}${ASM_OUTPUT_EXTENSION}" )
|
set( ASM_OUTPUT_${infile} "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/zdoom.dir/${indir}/${infile}${ASM_OUTPUT_EXTENSION}" )
|
||||||
if( WIN32 )
|
if( WIN32 AND NOT X64 )
|
||||||
set( FIXRTEXT_${infile} COMMAND ${FIXRTEXT} "${ASM_OUTPUT_${infile}}" )
|
set( FIXRTEXT_${infile} COMMAND ${FIXRTEXT} "${ASM_OUTPUT_${infile}}" )
|
||||||
else( WIN32 )
|
else( WIN32 AND NOT X64 )
|
||||||
set( FIXRTEXT_${infile} COMMAND "" )
|
set( FIXRTEXT_${infile} COMMAND "" )
|
||||||
endif( WIN32 )
|
endif( WIN32 AND NOT X64 )
|
||||||
add_custom_command( OUTPUT ${ASM_OUTPUT_${infile}}
|
add_custom_command( OUTPUT ${ASM_OUTPUT_${infile}}
|
||||||
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/zdoom.dir/${indir}
|
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/zdoom.dir/${indir}
|
||||||
COMMAND ${ASSEMBLER} ${ASM_FLAGS} -o"${ASM_OUTPUT_${infile}}" "${CMAKE_CURRENT_SOURCE_DIR}/${indir}/${infile}${ASM_SOURCE_EXTENSION}"
|
COMMAND ${ASSEMBLER} ${ASM_FLAGS} -o"${ASM_OUTPUT_${infile}}" "${CMAKE_CURRENT_SOURCE_DIR}/${indir}/${infile}${ASM_SOURCE_EXTENSION}"
|
||||||
|
|
|
@ -2,9 +2,9 @@ cmake_minimum_required( VERSION 2.4 )
|
||||||
|
|
||||||
add_subdirectory( lemon )
|
add_subdirectory( lemon )
|
||||||
add_subdirectory( re2c )
|
add_subdirectory( re2c )
|
||||||
if( WIN32 )
|
if( WIN32 AND NOT CMAKE_SIZEOF_VOID_P MATCHES "8" )
|
||||||
add_subdirectory( fixrtext )
|
add_subdirectory( fixrtext )
|
||||||
endif( WIN32 )
|
endif( WIN32 AND NOT CMAKE_SIZEOF_VOID_P MATCHES "8" )
|
||||||
add_subdirectory( updaterevision )
|
add_subdirectory( updaterevision )
|
||||||
add_subdirectory( zipdir )
|
add_subdirectory( zipdir )
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue