Permalink
Browse files

misc: renaming ARM option to RPI to keep RPI and Android builds separ…

…ately and avoid confusion
  • Loading branch information...
rafal1137 committed Nov 7, 2018
1 parent 6f291a5 commit 0b49ccbcb497ce8242060e8edde7c837fb143fc2
Showing with 10 additions and 15 deletions.
  1. +1 −1 CMakeLists.txt
  2. +8 −13 cmake/ETLPlatform.cmake
  3. +1 −1 easybuild.sh
@@ -85,7 +85,7 @@ cmake_dependent_option(INSTALL_OMNIBOT "Install Omni-bot" ON "INSTALL_EXT
cmake_dependent_option(INSTALL_GEOIP "Install GeoLite geolocation database" ON "INSTALL_EXTRA" OFF)
cmake_dependent_option(INSTALL_WOLFADMIN "Install WolfAdmin enhancement suite" ON "INSTALL_EXTRA" OFF)
option(ARM "Build ARM version" OFF)
option(RPI "Build RPI version" OFF)
set(ET_FS_BASEPATH "" CACHE STRING "Copy required genuine ET files from ET_FS_BASEPATH")
cmake_dependent_option(ET_KEY "Copy existing etkey file from ET_FS_BASEPATH)" ON "ET_FS_BASEPATH" OFF)
@@ -10,7 +10,7 @@ set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
message(STATUS "System: ${CMAKE_SYSTEM} (${ETLEGACY_SYSTEM_PROCESSOR})")
if(UNIX AND CROSS_COMPILE32 AND NOT ARM) # 32-bit build
if(UNIX AND CROSS_COMPILE32 AND NOT RPI) # 32-bit build
set(CMAKE_SYSTEM_PROCESSOR i386)
message(STATUS "Forcing ${CMAKE_SYSTEM_PROCESSOR} to cross compile 32bit")
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
@@ -22,24 +22,22 @@ if(UNIX AND CROSS_COMPILE32 AND NOT ARM) # 32-bit build
elseif(WIN32 AND CROSS_COMPILE32)
set(CMAKE_SYSTEM_PROCESSOR x86) #the new cmake on windows will otherwise use arch name of x64 which will fuck up our naming
set(ENV{PLATFORM} win32) #this is redundant but just to be safe
elseif(ARM AND CROSS_COMPILE32)
message(STATUS "Cross compiling not supported for ARM!")
elseif(RPI AND CROSS_COMPILE32)
message(STATUS "Cross compiling not supported for RPI!")
endif()
# FIXME: move this down to UNIX section?
if(ARM)
if(RPI)
if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv6l")
message(STATUS "ARMV6 build options set.")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -mfloat-abi=hard -mfpu=vfp -march=armv6zk -O2")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -mfloat-abi=hard -mfpu=vfp -mtune=arm1176jzf-s -march=armv6zk -O2")
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
message(STATUS "ARMV7 build options set.")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -mfloat-abi=hard -mfpu=neon -march=armv7-a -O2")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -mfloat-abi=hard -mfpu=neon -march=armv7-a -O2")
else()
message(STATUS "Unknown ARM processor detected !!!")
message(STATUS "Unknown RPI processor detected !!!")
endif()
endif(ARM)
endif(RPI)
if(APPLE)
# The ioapi requires this since OSX already uses 64 fileapi (there is no fseek64 etc)
@@ -162,14 +160,11 @@ if(NOT APPLE)
set(ARCH "x86_64")
endif()
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv6l")
message(STATUS "Detected ARMV6 target processor")
set(ARCH "arm")
set(ARCH "armv6")
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
message(STATUS "Detected ARMV7 target processor")
set(ARCH "arm")
set(ARCH "armv7")
#add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV7=1)
else()
set(ARCH "${CMAKE_SYSTEM_PROCESSOR}")
message(STATUS "Warning: processor architecture not recognised (${CMAKE_SYSTEM_PROCESSOR})")
endif()
endif(NOT APPLE)
@@ -259,7 +259,7 @@ parse_commandline() {
FEATURE_AUTOUPDATE=0
elif [ "$var" = "-RPI" ]; then
einfo "Will enable Raspberry PI build ..."
ARM=1
RPI=1
CROSS_COMPILE32=0
FEATURE_RENDERER_GLES=1
FEATURE_RENDERER2=0

0 comments on commit 0b49ccb

Please sign in to comment.