From e79336a68a7c4ea05333ce66ce82fdd49b792e11 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 15 Jul 2021 01:19:42 +0200 Subject: [PATCH 01/26] updated x-compile cmake files --- cmake/BBBCrossCompileConfig.cmake | 49 +++++++++++--------- cmake/RPiCrossCompileConfig.cmake | 74 ++++++++++++++++--------------- 2 files changed, 65 insertions(+), 58 deletions(-) diff --git a/cmake/BBBCrossCompileConfig.cmake b/cmake/BBBCrossCompileConfig.cmake index e1a669db..fcbab882 100644 --- a/cmake/BBBCrossCompileConfig.cmake +++ b/cmake/BBBCrossCompileConfig.cmake @@ -1,20 +1,22 @@ -# BBB_ROOTFS should point to the local directory which contains all the +# LINUX_ROOTFS should point to the local directory which contains all the # libraries and includes from the target raspi. # The following command can be used to do this, replace and the # local accordingly: # rsync -vR --progress -rl --delete-after --safe-links pi@:/{lib,usr,opt/vc/lib} -# RASPBIAN_ROOTFS needs to be passed to the CMake command or defined in the +# LINUX_ROOTFS needs to be passed to the CMake command or defined in the # application CMakeLists.txt before loading the toolchain file. # CROSS_COMPILE also needs to be set accordingly or passed to the CMake command - -if(NOT DEFINED ENV{BBB_ROOTFS}) - message(FATAL_ERROR - "Define the BBB_ROOTFS variable to point to the Beagle Bone Black rootfs." - ) +if(NOT DEFINED ENV{LINUX_ROOTFS}) + # Sysroot has not been cached yet and was not set in environment either + if(NOT SYSROOT_PATH) + message(FATAL_ERROR + "Define the LINUX_ROOTFS variable to point to the Raspberry Pi rootfs." + ) + endif() else() - set(SYSROOT_PATH "$ENV{BBB_ROOTFS}" CACHE FILEPATH "BBB root filesystem path") - message(STATUS "Beagle Bone Black sysroot: ${SYSROOT_PATH}") + set(SYSROOT_PATH "$ENV{LINUX_ROOTFS}" CACHE PATH "Local linux root filesystem path") + message(STATUS "Raspberry Pi sysroot: ${SYSROOT_PATH}") endif() if(NOT DEFINED ENV{CROSS_COMPILE}) @@ -31,6 +33,15 @@ else() ) endif() +# Generally, the debian roots will be a multiarch rootfs where some libraries are put +# into a folder named "arm-linux-gnueabihf". The user can override the folder name if this is +# not the case +if(NOT ENV{MULTIARCH_FOLDER_NAME}) + set(MULTIARCH_FOLDER_NAME "arm-linux-gnueabihf") +else() + set(MUTLIARCH_FOLDER_NAME $ENV{MULTIARCH_FOLDER_NAME}) +endif() + message(STATUS "Using sysroot path: ${SYSROOT_PATH}") set(CROSS_COMPILE_CC "${CROSS_COMPILE}-gcc") @@ -44,8 +55,11 @@ set(CROSS_COMPILE_OBJCOPY "${CROSS_COMPILE}-objcopy") set(CROSS_COMPILE_SIZE "${CROSS_COMPILE}-size") # At the very least, cross compile gcc and g++ have to be set! -find_program (CROSS_COMPILE_CC_FOUND ${CROSS_COMPILE_CC} REQUIRED) -find_program (CROSS_COMPILE_CXX_FOUND ${CROSS_COMPILE_CXX} REQUIRED) +find_program (CMAKE_C_COMPILER ${CROSS_COMPILE_CC} REQUIRED) +find_program (CMAKE_CXX_COMPILER ${CROSS_COMPILE_CXX} REQUIRED) +# Useful utilities, not strictly necessary +find_program(CMAKE_SIZE ${CROSS_COMPILE_SIZE}) +find_program(CMAKE_OBJCOPY ${CROSS_COMPILE_OBJCOPY}) set(CMAKE_CROSSCOMPILING TRUE) set(CMAKE_SYSROOT "${SYSROOT_PATH}") @@ -54,16 +68,12 @@ set(CMAKE_SYSROOT "${SYSROOT_PATH}") set(CMAKE_SYSTEM_NAME "Linux") set(CMAKE_SYSTEM_PROCESSOR "arm") -# Define the compiler -set(CMAKE_C_COMPILER ${CROSS_COMPILE_CC}) -set(CMAKE_CXX_COMPILER ${CROSS_COMPILE_CXX}) - # List of library dirs where LD has to look. Pass them directly through gcc. # LD_LIBRARY_PATH is not evaluated by arm-*-ld set(LIB_DIRS - "${SYSROOT_PATH}/lib/${CROSS_COMPILE}" + "${SYSROOT_PATH}/lib/${MUTLIARCH_FOLDER_NAME}" "${SYSROOT_PATH}/usr/local/lib" - "${SYSROOT_PATH}/usr/lib/${CROSS_COMPILE}" + "${SYSROOT_PATH}/usr/lib/${MUTLIARCH_FOLDER_NAME}" "${SYSROOT_PATH}/usr/lib" ) # You can additionally check the linker paths if you add the @@ -73,11 +83,6 @@ foreach(LIB ${LIB_DIRS}) set(COMMON_FLAGS "${COMMON_FLAGS} -L${LIB} -Wl,-rpath-link,${LIB}") endforeach() -set(CMAKE_PREFIX_PATH - "${CMAKE_PREFIX_PATH}" - "${SYSROOT_PATH}/usr/lib/${CROSS_COMPILE}" -) - set(CMAKE_C_FLAGS "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=hard ${COMMON_FLAGS}" CACHE STRING "Flags for Beagle Bone Black" diff --git a/cmake/RPiCrossCompileConfig.cmake b/cmake/RPiCrossCompileConfig.cmake index 1f246443..5806af59 100644 --- a/cmake/RPiCrossCompileConfig.cmake +++ b/cmake/RPiCrossCompileConfig.cmake @@ -1,7 +1,7 @@ # Based on https://github.com/Pro/raspi-toolchain but rewritten completely. # Adapted for the FSFW Example -if(NOT $ENV{RASPBERRY_VERSION}) +if(NOT DEFINED ENV{RASPBERRY_VERSION}) message(STATUS "Raspberry Pi version not specified, setting version 4!") set(RASPBERRY_VERSION 4) else() @@ -9,23 +9,25 @@ else() endif() -# RASPBIAN_ROOTFS should point to the local directory which contains all the +# LINUX_ROOTFS should point to the local directory which contains all the # libraries and includes from the target raspi. # The following command can be used to do this, replace and the # local accordingly: # rsync -vR --progress -rl --delete-after --safe-links pi@:/{lib,usr,opt/vc/lib} -# RASPBIAN_ROOTFS needs to be passed to the CMake command or defined in the +# LINUX_ROOTFS needs to be passed to the CMake command or defined in the # application CMakeLists.txt before loading the toolchain file. # CROSS_COMPILE also needs to be set accordingly or passed to the CMake command - -if(NOT DEFINED ENV{RASPBIAN_ROOTFS}) - message(FATAL_ERROR - "Define the RASPBIAN_ROOTFS variable to " - "point to the raspbian rootfs." - ) +if(NOT DEFINED ENV{LINUX_ROOTFS}) + # Sysroot has not been cached yet and was not set in environment either + if(NOT SYSROOT_PATH) + message(FATAL_ERROR + "Define the LINUX_ROOTFS variable to point to the Raspberry Pi rootfs." + ) + endif() else() - set(SYSROOT_PATH "$ENV{RASPBIAN_ROOTFS}" CACHE FILEPATH "RPi root filesystem path") + set(SYSROOT_PATH "$ENV{LINUX_ROOTFS}" CACHE PATH "Local linux root filesystem path") + message(STATUS "Raspberry Pi sysroot: ${SYSROOT_PATH}") endif() if(NOT DEFINED ENV{CROSS_COMPILE}) @@ -42,6 +44,15 @@ else() ) endif() +# Generally, the debian roots will be a multiarch rootfs where some libraries are put +# into a folder named "arm-linux-gnueabihf". The user can override the folder name if this is +# not the case +if(NOT ENV{MULTIARCH_FOLDER_NAME}) + set(MULTIARCH_FOLDER_NAME "arm-linux-gnueabihf") +else() + set(MUTLIARCH_FOLDER_NAME $ENV{MULTIARCH_FOLDER_NAME}) +endif() + message(STATUS "Using sysroot path: ${SYSROOT_PATH}") set(CROSS_COMPILE_CC "${CROSS_COMPILE}-gcc") @@ -55,8 +66,11 @@ set(CROSS_COMPILE_OBJCOPY "${CROSS_COMPILE}-objcopy") set(CROSS_COMPILE_SIZE "${CROSS_COMPILE}-size") # At the very least, cross compile gcc and g++ have to be set! -find_program (CROSS_COMPILE_CC_FOUND ${CROSS_COMPILE_CC} REQUIRED) -find_program (CROSS_COMPILE_CXX_FOUND ${CROSS_COMPILE_CXX} REQUIRED) +find_program (CMAKE_C_COMPILER ${CROSS_COMPILE_CC} REQUIRED) +find_program (CMAKE_CXX_COMPILER ${CROSS_COMPILE_CXX} REQUIRED) +# Useful utilities, not strictly necessary +find_program(CMAKE_SIZE ${CROSS_COMPILE_SIZE}) +find_program(CMAKE_OBJCOPY ${CROSS_COMPILE_OBJCOPY}) set(CMAKE_CROSSCOMPILING TRUE) set(CMAKE_SYSROOT "${SYSROOT_PATH}") @@ -69,22 +83,16 @@ else() set(CMAKE_SYSTEM_PROCESSOR "arm") endif() -# Define the compiler -set(CMAKE_C_COMPILER ${CROSS_COMPILE_CC}) -set(CMAKE_CXX_COMPILER ${CROSS_COMPILE_CXX}) - # List of library dirs where LD has to look. Pass them directly through gcc. # LD_LIBRARY_PATH is not evaluated by arm-*-ld set(LIB_DIRS - "/opt/cross-pi-gcc/arm-linux-gnueabihf/lib" - "/opt/cross-pi-gcc/lib" "${SYSROOT_PATH}/opt/vc/lib" - "${SYSROOT_PATH}/lib/${CROSS_COMPILE}" + "${SYSROOT_PATH}/lib/${MULTIARCH_FOLDER_NAME}" "${SYSROOT_PATH}/usr/local/lib" - "${SYSROOT_PATH}/usr/lib/${CROSS_COMPILE}" + "${SYSROOT_PATH}/usr/lib/${MULTIARCH_FOLDER_NAME}" "${SYSROOT_PATH}/usr/lib" - "${SYSROOT_PATH}/usr/lib/${CROSS_COMPILE}/blas" - "${SYSROOT_PATH}/usr/lib/${CROSS_COMPILE}/lapack" + "${SYSROOT_PATH}/usr/lib/${MULTIARCH_FOLDER_NAME}/blas" + "${SYSROOT_PATH}/usr/lib/${MULTIARCH_FOLDER_NAME}/lapack" ) # You can additionally check the linker paths if you add the # flags ' -Xlinker --verbose' @@ -93,43 +101,38 @@ foreach(LIB ${LIB_DIRS}) set(COMMON_FLAGS "${COMMON_FLAGS} -L${LIB} -Wl,-rpath-link,${LIB}") endforeach() -set(CMAKE_PREFIX_PATH - "${CMAKE_PREFIX_PATH}" - "${SYSROOT_PATH}/usr/lib/${CROSS_COMPILE}" -) - if(RASPBERRY_VERSION VERSION_GREATER 3) set(CMAKE_C_FLAGS "-mcpu=cortex-a72 -mfpu=neon-vfpv4 -mfloat-abi=hard ${COMMON_FLAGS}" - CACHE STRING "CPP flags for Raspberry PI 4" + CACHE STRING "Flags for Raspberry Pi 4" ) set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}" - CACHE STRING "C flags for Raspberry PI 4" + CACHE STRING "Flags for Raspberry Pi 4" ) elseif(RASPBERRY_VERSION VERSION_GREATER 2) set(CMAKE_C_FLAGS "-mcpu=cortex-a53 -mfpu=neon-vfpv4 -mfloat-abi=hard ${COMMON_FLAGS}" - CACHE STRING "C flags for Raspberry PI 3" + CACHE STRING "Flags for Raspberry Pi 3" ) set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}" - CACHE STRING "CPP flags for Raspberry PI 3" + CACHE STRING "Flags for Raspberry Pi 3" ) elseif(RASPBERRY_VERSION VERSION_GREATER 1) set(CMAKE_C_FLAGS "-mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard ${COMMON_FLAGS}" - CACHE STRING "C flags for Raspberry PI 2" + CACHE STRING "Flags for Raspberry Pi 2" ) set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}" - CACHE STRING "CPP flags for Raspberry PI 2" + CACHE STRING "Flags for Raspberry Pi 2" ) else() set(CMAKE_C_FLAGS "-mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard ${COMMON_FLAGS}" - CACHE STRING "C flags for Raspberry PI 1 B+ Zero" + CACHE STRING "Flags for Raspberry Pi 1 B+ Zero" ) set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}" - CACHE STRING "CPP flags for Raspberry PI 1 B+ Zero" + CACHE STRING "Flags for Raspberry PI 1 B+ Zero" ) endif() @@ -137,7 +140,6 @@ set(CMAKE_FIND_ROOT_PATH "${CMAKE_INSTALL_PREFIX};${CMAKE_PREFIX_PATH};${CMAKE_SYSROOT}" ) - # search for programs in the build host directories set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # for libraries and headers in the target directories From dd9b08953c76ed0859e1983875a57f045ad044b7 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 15 Jul 2021 01:21:42 +0200 Subject: [PATCH 02/26] q7s x-compile file update --- cmake/Q7SCrossCompileConfig.cmake | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/cmake/Q7SCrossCompileConfig.cmake b/cmake/Q7SCrossCompileConfig.cmake index bc95a909..a4336983 100644 --- a/cmake/Q7SCrossCompileConfig.cmake +++ b/cmake/Q7SCrossCompileConfig.cmake @@ -1,10 +1,12 @@ # CROSS_COMPILE also needs to be set accordingly or passed to the CMake command - if(NOT DEFINED ENV{Q7S_SYSROOT}) -# message(FATAL_ERROR -# "Define the Q7S_ROOTFS variable to " -# "point to the raspbian rootfs." -# ) + # Sysroot has not been cached yet and was not set in environment either + if(NOT DEFINED SYSROOT_PATH) + message(FATAL_ERROR + "Define the Q7S_ROOTFS variable to " + "point to the raspbian rootfs." + ) + endif() else() set(SYSROOT_PATH "$ENV{Q7S_SYSROOT}" CACHE PATH "Q7S root filesystem path") endif() @@ -36,8 +38,11 @@ set(CROSS_COMPILE_OBJCOPY "${CROSS_COMPILE}-objcopy") set(CROSS_COMPILE_SIZE "${CROSS_COMPILE}-size") # At the very least, cross compile gcc and g++ have to be set! -find_program (CROSS_COMPILE_CC_FOUND ${CROSS_COMPILE_CC} REQUIRED) -find_program (CROSS_COMPILE_CXX_FOUND ${CROSS_COMPILE_CXX} REQUIRED) +find_program (CMAKE_C_COMPILER ${CROSS_COMPILE_CC} REQUIRED) +find_program (CMAKE_CXX_COMPILER ${CROSS_COMPILE_CXX} REQUIRED) +# Useful utilities, not strictly necessary +find_program(CMAKE_SIZE ${CROSS_COMPILE_SIZE}) +find_program(CMAKE_OBJCOPY ${CROSS_COMPILE_OBJCOPY}) set(CMAKE_CROSSCOMPILING TRUE) set(CMAKE_SYSROOT "${SYSROOT_PATH}") From 545625039d335ab4c450f6cf6c7b526f7b3feb49 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 15 Jul 2021 01:25:32 +0200 Subject: [PATCH 03/26] update fsfw --- CMakeLists.txt | 8 ++++---- cmake/HardwareOsPreConfig.cmake | 6 +++--- cmake/PreProjectConfig.cmake | 12 ++++++------ fsfw | 2 +- mission/core/GenericFactory.cpp | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cbf38410..b365b841 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,8 @@ if(TGT_BSP MATCHES "arm/q7s") endif() option(ADD_ETL_LIB "Add ETL library" ON) -if(NOT OS_FSFW) - set(OS_FSFW host CACHE STRING "OS for the FSFW.") +if(NOT FSFW_OSAL) + set(FSFW_OSAL host CACHE STRING "OS for the FSFW.") endif() if(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack") @@ -156,7 +156,7 @@ endif() # Post-Sources preparation ################################################################################ -set_property(CACHE OS_FSFW PROPERTY STRINGS host linux) +set_property(CACHE FSFW_OSAL PROPERTY STRINGS host linux) if(NOT Q7S_SIMPLE_MODE) # Add libraries for all sources. @@ -243,7 +243,7 @@ endif() string(CONCAT POST_BUILD_COMMENT "Build directory: ${CMAKE_BINARY_DIR}\n" - "Target OSAL: ${OS_FSFW}\n" + "Target OSAL: ${FSFW_OSAL}\n" "Target Build Type: ${CMAKE_BUILD_TYPE}\n" "${TARGET_STRING}" ) diff --git a/cmake/HardwareOsPreConfig.cmake b/cmake/HardwareOsPreConfig.cmake index 38248fce..535f9b9e 100644 --- a/cmake/HardwareOsPreConfig.cmake +++ b/cmake/HardwareOsPreConfig.cmake @@ -1,13 +1,13 @@ function(pre_source_hw_os_config) # FreeRTOS -if(${OS_FSFW} MATCHES freertos) +if(FSFW_OSAL MATCHES freertos) message(FATAL_ERROR "No FreeRTOS support implemented yet.") # RTEMS -elseif(${OS_FSFW} STREQUAL rtems) +elseif(FSFW_OSAL STREQUAL rtems) add_definitions(-DRTEMS) message(FATAL_ERROR "No RTEMS support implemented yet.") -elseif(${OS_FSFW} STREQUAL linux) +elseif(FSFW_OSAL STREQUAL linux) add_definitions(-DUNIX -DLINUX) find_package(Threads REQUIRED) # Hosted diff --git a/cmake/PreProjectConfig.cmake b/cmake/PreProjectConfig.cmake index 8a013d83..c2670e33 100644 --- a/cmake/PreProjectConfig.cmake +++ b/cmake/PreProjectConfig.cmake @@ -2,21 +2,21 @@ function(pre_project_config) # Basic input sanitization if(DEFINED TGT_BSP) - if(${TGT_BSP} MATCHES "arm/raspberrypi" AND NOT ${OS_FSFW} MATCHES linux) + if(${TGT_BSP} MATCHES "arm/raspberrypi" AND NOT FSFW_OSAL MATCHES linux) message(STATUS "FSFW OSAL invalid for specified target BSP ${TGT_BSP}!") - message(STATUS "Setting valid OS_FSFW: linux") - set(OS_FSFW "linux") + message(STATUS "Setting valid FSFW_OSAL: linux") + set(FSFW_OSAL "linux") endif() endif() # Disable compiler checks for cross-compiling. -if(${OS_FSFW} STREQUAL linux AND TGT_BSP) - if(${TGT_BSP} MATCHES "arm/q7s") +if(FSFW_OSAL MATCHES linux AND TGT_BSP) + if(TGT_BSP MATCHES "arm/q7s") set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SCRIPT_PATH}/Q7SCrossCompileConfig.cmake" PARENT_SCOPE ) - elseif (${TGT_BSP} MATCHES "arm/raspberrypi") + elseif(TGT_BSP MATCHES "arm/raspberrypi") if(NOT DEFINED ENV{RASPBIAN_ROOTFS}) if(NOT DEFINED RASPBIAN_ROOTFS) message(WARNING "No RASPBIAN_ROOTFS environmental or CMake variable set!") diff --git a/fsfw b/fsfw index eef2fd3b..62e0465b 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit eef2fd3b7ac764f06ed5d9a3c97c894d92a515fa +Subproject commit 62e0465b3d3aad22d03be45ca4fe30f25bc38010 diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp index fae8b7d8..a6708f98 100644 --- a/mission/core/GenericFactory.cpp +++ b/mission/core/GenericFactory.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include From 12cd9916ca95f364a41a236aeefff1ee41dbc3ae Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 15 Jul 2021 01:28:25 +0200 Subject: [PATCH 04/26] script corrections --- CMakeLists.txt | 4 ++-- cmake/scripts/cmake_build_config.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b365b841..6fa14d19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,8 +75,8 @@ include (${CMAKE_SCRIPT_PATH}/HardwareOsPreConfig.cmake) pre_source_hw_os_config() if(TGT_BSP) - if(${TGT_BSP} MATCHES "arm/q7s" OR ${TGT_BSP} MATCHES "arm/raspberrypi" - OR ${TGT_BSP} MATCHES "arm/beagleboneblack" + if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/raspberrypi" + OR TGT_BSP MATCHES "arm/beagleboneblack" ) set(FSFW_CONFIG_PATH "linux/fsfwconfig") if(NOT Q7S_SIMPLE_MODE) diff --git a/cmake/scripts/cmake_build_config.py b/cmake/scripts/cmake_build_config.py index 67f175d9..e3259fd4 100755 --- a/cmake/scripts/cmake_build_config.py +++ b/cmake/scripts/cmake_build_config.py @@ -98,7 +98,7 @@ def main(): print(f"Navigating into build directory: {build_path}") os.chdir(build_folder) - cmake_command = f"cmake {generator_cmake_arg} -DOS_FSFW=\"{osal}\" " \ + cmake_command = f"cmake {generator_cmake_arg} -DFSFW_OSAL=\"{osal}\" " \ f"-DCMAKE_BUILD_TYPE=\"{cmake_build_type}\" {cmake_target_cfg_cmd} " \ f"{define_string} {source_location}" # Remove redundant spaces From 6864aaf770a0f82015f81368f1fe1885ec6650ad Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 15 Jul 2021 01:29:13 +0200 Subject: [PATCH 05/26] author tag update --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fa14d19..c7a7e434 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,6 @@ ################################################################################ # CMake support for the EIVE OBSW # -# Developed in an effort to replace Make with a modern build system. -# # Author: R. Mueller ################################################################################ From 8ea58fc66b10b74b1931f51145839fb451f1493f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 15 Jul 2021 01:31:01 +0200 Subject: [PATCH 06/26] updated project file --- misc/eclipse/.cproject | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/misc/eclipse/.cproject b/misc/eclipse/.cproject index 16bd992b..05889c7d 100644 --- a/misc/eclipse/.cproject +++ b/misc/eclipse/.cproject @@ -648,6 +648,7 @@ @@ -657,6 +658,7 @@ +