this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

added curl to rpi build

nesbox 73d3be79 7d9ca33a

+37 -26
+1 -1
.github/workflows/build.yml
··· 153 153 - name: Build 154 154 run: | 155 155 cd build 156 - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. -DCMAKE_TOOLCHAIN_FILE=rpi/toolchain.cmake 156 + sudo cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. -DCMAKE_TOOLCHAIN_FILE=rpi/toolchain.cmake -DRPI_HOME=$RPI_HOME 157 157 sudo cmake --build . --parallel --config $BUILD_TYPE 158 158 sudo cpack 159 159
+21 -17
CMakeLists.txt
··· 58 58 option(BUILD_PLAYER "Build standalone players" ${BUILD_PLAYER_DEFAULT}) 59 59 option(BUILD_TOUCH_INPUT "Build with touch input support" ${BUILD_TOUCH_INPUT_DEFAULT}) 60 60 61 - if(RPI) 62 - set(DISABLE_NETWORKING TRUE) 63 - endif() 64 - 65 61 if(NOT BUILD_SDL) 66 62 set(BUILD_SDLGPU OFF) 67 63 endif() ··· 539 535 540 536 if (NOT DISABLE_NETWORKING) 541 537 542 - if (NOT N3DS) 538 + if (NOT N3DS) 543 539 544 - set(BUILD_SHARED_LIBS OFF CACHE BOOL "") 540 + set(BUILD_SHARED_LIBS OFF CACHE BOOL "") 545 541 546 - if(WIN32) 547 - set(CURL_STATIC_CRT ON CACHE BOOL "") 548 - endif() 542 + if(WIN32) 543 + set(CURL_STATIC_CRT ON CACHE BOOL "") 544 + endif() 549 545 550 - set(CMAKE_USE_OPENSSL OFF CACHE BOOL "" ) 551 - set(CMAKE_USE_LIBSSH2 OFF CACHE BOOL "") 552 - set(HTTP_ONLY ON CACHE BOOL "") 553 - set(BUILD_CURL_EXE OFF CACHE BOOL "") 554 - set(CURL_CA_BUNDLE "none" CACHE STRING "") 555 - set(CURL_CA_PATH "none" CACHE STRING "") 546 + set(CMAKE_USE_OPENSSL OFF CACHE BOOL "" ) 547 + set(CMAKE_USE_LIBSSH2 OFF CACHE BOOL "") 548 + set(HTTP_ONLY ON CACHE BOOL "") 549 + set(BUILD_CURL_EXE OFF CACHE BOOL "") 550 + set(CURL_CA_BUNDLE "none" CACHE STRING "") 551 + set(CURL_CA_PATH "none" CACHE STRING "") 552 + 553 + if(RPI) 554 + set(CURL_ZLIB OFF CACHE BOOL "" ) 555 + endif() 556 556 557 - add_subdirectory(${THIRDPARTY_DIR}/curl) 557 + add_subdirectory(${THIRDPARTY_DIR}/curl) 558 558 559 - endif() 559 + if(RPI) 560 + target_compile_definitions(libcurl PRIVATE NOT_USE_FILE_OFFSET64) 561 + endif() 562 + 563 + endif() 560 564 561 565 endif() 562 566
+15 -8
build/rpi/toolchain.cmake
··· 1 1 # Define our host system 2 - SET(CMAKE_SYSTEM_NAME Linux) 3 - SET(CMAKE_SYSTEM_VERSION 1) 2 + set(CMAKE_SYSTEM_NAME Linux) 3 + set(CMAKE_SYSTEM_VERSION 1) 4 4 5 - SET(CMAKE_LIBRARY_ARCHITECTURE arm-linux-gnueabihf) 6 - set(RPI_HOME $ENV{RPI_HOME}) 5 + set(CMAKE_LIBRARY_ARCHITECTURE arm-linux-gnueabihf) 6 + 7 + if(NOT DEFINED RPI_HOME) 8 + set(RPI_HOME $ENV{RPI_HOME}) 9 + endif() 10 + 7 11 set(SYSROOT_PATH ${RPI_HOME}/sysroot) 8 12 9 13 # Define the cross compiler locations 10 - SET(CMAKE_C_COMPILER ${RPI_HOME}/tools/arm-bcm2708/${CMAKE_LIBRARY_ARCHITECTURE}/bin/${CMAKE_LIBRARY_ARCHITECTURE}-gcc) 11 - SET(CMAKE_CXX_COMPILER ${RPI_HOME}/tools/arm-bcm2708/${CMAKE_LIBRARY_ARCHITECTURE}/bin/${CMAKE_LIBRARY_ARCHITECTURE}-g++) 14 + set(CMAKE_C_COMPILER ${RPI_HOME}/tools/arm-bcm2708/${CMAKE_LIBRARY_ARCHITECTURE}/bin/${CMAKE_LIBRARY_ARCHITECTURE}-gcc) 15 + set(CMAKE_CXX_COMPILER ${RPI_HOME}/tools/arm-bcm2708/${CMAKE_LIBRARY_ARCHITECTURE}/bin/${CMAKE_LIBRARY_ARCHITECTURE}-g++) 12 16 13 17 # Define the sysroot path for the RaspberryPi distribution in our tools folder 14 - SET(CMAKE_FIND_ROOT_PATH ${SYSROOT_PATH}) 18 + set(CMAKE_FIND_ROOT_PATH ${SYSROOT_PATH}) 15 19 16 20 # Use our definitions for compiler tools 17 - SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) 21 + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) 18 22 19 23 # Search for libraries and headers in the target directories only 20 24 set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) 21 25 set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) 26 + 27 + include_directories(${SYSROOT_PATH}/usr/include) 28 + include_directories(${SYSROOT_PATH}/usr/include/${CMAKE_LIBRARY_ARCHITECTURE}) 22 29 23 30 set(RPI TRUE)