From ca623d306120bbee0334f06a040b03a978b9ee10 Mon Sep 17 00:00:00 2001 From: AsiiaPine Date: Tue, 19 Nov 2024 10:35:44 +0300 Subject: [PATCH] rmv makefile changes --- Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 2c66357..6622be5 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,5 @@ # Copyright (C) 2023-2024 Dmitry Ponomarev # Distributed under the terms of the GPL v3 license, available in the file LICENSE. -# Variables -CC := arm-none-eabi-gcc -CFLAGS := -g -Og - -# Add compile flags to cmake -CMAKE_FLAGS := "-DCMAKE_C_COMPILER=${CC} -DCMAKE_CXX_COMPILER=${CC} -DCMAKE_BUILD_TYPE=Debug" ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) BUILD_DIR:=$(ROOT_DIR)/build @@ -44,7 +38,7 @@ sitl_dronecan: checks clean cd ${BUILD_DIR}/dronecan_sitl/obj && cmake -DCAN_PROTOCOL=dronecan -DUSE_PLATFORM_UBUNTU=ON -G "Unix Makefiles" ../../.. && make dronecan_v3: checks clean mkdir -p ${BUILD_DIR}/dronecan_v3/obj - cd ${BUILD_DIR}/dronecan_v3/obj && cmake -DCAN_PROTOCOL=dronecan -DUSE_PLATFORM_NODE_V3=ON ${CMAKE_FLAGS} -G "Unix Makefiles" ../../.. && make + cd ${BUILD_DIR}/dronecan_v3/obj && cmake -DCAN_PROTOCOL=dronecan -DUSE_PLATFORM_NODE_V3=ON -G "Unix Makefiles" ../../.. && make # Cyphal & DroneCAN v2: checks generate_dsdl clean @@ -80,4 +74,4 @@ clean_releases: clean: -rm -fR ${BUILD_DIR}/*/obj distclean: - -rm -fR ${BUILD_DIR}/ + -rm -fR ${BUILD_DIR}/ \ No newline at end of file