Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Alam Arias 2019-03-19 01:05:54 -04:00
commit e50eb1f593

View file

@ -57,7 +57,8 @@ macro(copy_files_to_build_dir target dlllist_var)
endmacro() endmacro()
# 64-bit check # 64-bit check
if(${CMAKE_SIZEOF_VOID_P} EQUAL 8) message(STATUS "CMAKE_SIZEOF_VOID_P=" ${CMAKE_SIZEOF_VOID_P})
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
message(STATUS "Target is 64-bit") message(STATUS "Target is 64-bit")
set(SRB2_SYSTEM_BITS 64) set(SRB2_SYSTEM_BITS 64)
else() else()