rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usability

This commit is contained in:
rusefi 2018-12-23 01:54:14 -05:00
parent e1b3fb7337
commit a5b1bf6b8d
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
simulator/Makefile
View File

@ -3,12 +3,12 @@
# NOTE: Can be overridden externally. # NOTE: Can be overridden externally.
# #
ifeq ("$(wildcard ../firmware/ChibiOS4/os/common/startup/ARMCMx/compilers/GCC/rules.mk)","")
# CHIBIOS = ../firmware/ChibiOS4
# todo: someone please figure out the syntax to invoke 'git submodule update --init' from here RULESPATH = $(CHIBIOS)/os/common/startup/SIMIA32/compilers/GCC
# RULESFILE = $(RULESPATH)/rules.mk
$(error Modules are missing? Did you execute 'git submodule update --init'?)
endif include ../firmware/rusefi.mk
# Compiler options here. # Compiler options here.
@ -84,7 +84,6 @@ PROJECT = rusefi_simulator
PROJECT_DIR = ../firmware PROJECT_DIR = ../firmware
# Imported source files and paths # Imported source files and paths
CHIBIOS = ../firmware/ChibiOS4
# Startup files. # Startup files.
# HAL-OSAL files (optional). # HAL-OSAL files (optional).
@ -267,5 +266,4 @@ endif
# End of user defines # End of user defines
############################################################################## ##############################################################################
RULESPATH = $(CHIBIOS)/os/common/startup/SIMIA32/compilers/GCC
include $(RULESPATH)/rules.mk include $(RULESPATH)/rules.mk

12
unit_tests/Makefile
View File

@ -4,7 +4,16 @@
# #
PROJECT_DIR = ../firmware PROJECT_DIR = ../firmware
#CHIBIOS = $(PROJECT_DIR)/chibios CHIBIOS=$(PROJECT_DIR)/ChibiOS4
STREAMSFILE = $(CHIBIOS)/os/hal/include/hal_streams.h
ifeq ("$(wildcard $(STREAMSFILE))","")
$(info Invoking "git submodule update --init")
$(shell git submodule update --init)
$(info Invoked "git submodule update --init")
# make is not happy about newly checked out module for some reason but next invocation would work
$(error Please run 'make' again)
endif
# Compiler options here. # Compiler options here.
ifeq ($(USE_OPT),) ifeq ($(USE_OPT),)
@ -138,7 +147,6 @@ TCPPSRC =
# List ASM source files here # List ASM source files here
ASMSRC = $(PORTASM) ASMSRC = $(PORTASM)
CHIBIOS=$(PROJECT_DIR)/ChibiOS4
INCDIR = . \ INCDIR = . \
$(PROJECT_DIR)/util \ $(PROJECT_DIR)/util \