From 8995e8b1f29f9c5da4d8c08fafcba53c58ee7947 Mon Sep 17 00:00:00 2001 From: lonkaars Date: Thu, 26 May 2022 15:42:52 +0200 Subject: fix client compilation temporarily and disable sim on master branch --- client/makefile | 2 +- robot/makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/makefile b/client/makefile index 8bc8ac7..4cca15a 100644 --- a/client/makefile +++ b/client/makefile @@ -8,7 +8,7 @@ all: $(EXECNAME) SOURCES := $(wildcard *.c) HEADERS := $(wildcard *.h) -include ../shared/makefile +# include ../shared/makefile OBJECTS := $(patsubst %.c,%.o, $(SOURCES)) .o: diff --git a/robot/makefile b/robot/makefile index a6e96ee..4039ae3 100644 --- a/robot/makefile +++ b/robot/makefile @@ -17,7 +17,7 @@ HEADERS := $(filter-out sim.h, $(wildcard *.h)) include ../shared/makefile # simulation -SIM = true +# SIM = true CFLAGS += $(if $(SIM), -DW2_SIM, -mcall-prologues -mmcu=$(MCU)) LDFLAGS += $(if $(SIM), , -lpololu_$(DEVICE)) PREFIX := $(if $(SIM), , avr-) -- cgit v1.2.3