Merge branch 'master' of https://github.com/STJr/SRB2 into gl_shaders

This commit is contained in:
Jaime Passos 2019-03-19 15:33:16 -03:00
commit 848ae84188

View file

@ -54,13 +54,19 @@ macro(copy_files_to_build_dir target dlllist_var)
endif() endif()
endmacro() endmacro()
# 64-bit check # bitness check
if(${CMAKE_SIZEOF_VOID_P} EQUAL 8) set(SRB2_SYSTEM_BITS 0)
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() endif()
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
message(STATUS "Target is 32-bit")
set(SRB2_SYSTEM_BITS 32) set(SRB2_SYSTEM_BITS 32)
endif() endif()
if(${SRB2_SYSTEM_BITS} EQUAL 0)
message(STATUS "Target bitness is unknown")
endif()
# OS macros # OS macros
if (UNIX) if (UNIX)