actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #888 from Wallacoloo/armv7

Browse Source 
Fix armv7 build errors
This commit is contained in:
Kyzentun
2015-10-21 01:39:14 -06:00
parent a816de735a dcd676b956
commit 799eeaff6d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
+4 -2
View File
@@ -140,7 +140,7 @@ if(MSVC)
endif() endif()
set_target_properties("${SM_EXE_NAME}" PROPERTIES set_target_properties("${SM_EXE_NAME}" PROPERTIES
COMPILE_FLAGS ${SM_COMPILE_FLAGS} COMPILE_FLAGS "${SM_COMPILE_FLAGS}"
) )
set_target_properties("${SM_EXE_NAME}" PROPERTIES set_target_properties("${SM_EXE_NAME}" PROPERTIES
@@ -294,9 +294,11 @@ else() # Linux
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
message("Host processor is 64bit") message("Host processor is 64bit")
sm_add_compile_definition("${SM_EXE_NAME}" CPU_X86_64) sm_add_compile_definition("${SM_EXE_NAME}" CPU_X86_64)
else() elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86")
message("Host processor is 32bit") message("Host processor is 32bit")
sm_add_compile_definition("${SM_EXE_NAME}" CPU_X86) sm_add_compile_definition("${SM_EXE_NAME}" CPU_X86)
else()
message("Unrecognized host processor type")
endif() endif()
endif() endif()
if (${HAS_FFMPEG}) if (${HAS_FFMPEG})