diff --git a/Makefile b/Makefile index 5ab1a83..7347a42 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,7 @@ VERSION ?= invar-$(shell grep -Eo '[0-9]+\.[0-9]+\.[0-9]+' $(FORGE_SRC)/configur SOURCES ?= $(FORGE_SRC)/src/*.h $(FORGE_SRC)/src/*.c $(FORGE_SRC)/hashmap.c/hashmap.c $(FORGE_SRC)/log.c/src/log.c CFLAGS ?= -Ofast -Ofast -march=native -flto -funroll-loops -fprefetch-loop-arrays -fno-exceptions -fopenmp -I$(FORGE_SRC)/include -DGLFW_INCLUDE_NONE -DGLFW_NATIVE_INCLUDE_NONE -DVERSION=\"$(VERSION)\" -DOPENGL_MAJOR_VERSION=3 -DOPENGL_MINOR_VERSION=1 LDLIBS ?= -lm -lGL -lglfw -lasound +LOG_FIX ?= stdbuf -oL -eL # FILES @@ -56,11 +57,11 @@ build: $(BUILD_DIR)/$(TARGET) .PHONY: start-fg start-fg: $(BUILD_DIR)/$(TARGET) - @$(BUILD_DIR)/$(TARGET) $(RUN_ARGS) 2>&1 | tee -ai $(PROJECT_DIR)/forge.log 2>&1 > /dev/null + @$(LOG_FIX) $(BUILD_DIR)/$(TARGET) $(RUN_ARGS) >> $(PROJECT_DIR)/forge.log 2>&1 .PHONY: start-bg start-bg: - @python3 $(PROJECT_DIR)/__main__.py 2>&1 | tee -ai $(PROJECT_DIR)/python.log 2>&1 > /dev/null & + @$(LOG_FIX) python3 $(PROJECT_DIR)/__main__.py >> $(PROJECT_DIR)/python.log 2>&1 & .PHONY: start start: start-bg start-fg diff --git a/Makefile.dev b/Makefile.dev index 0e81d16..3b4a042 100644 --- a/Makefile.dev +++ b/Makefile.dev @@ -76,7 +76,7 @@ debug-img: uv-run-invar-mode-debug-img ## debug i2c screen with mock data sentences: glsl-glyphs-sentences ## generate project/inc_sentences.glsl .PHONY: rasp-init -rasp-init: rasp-chmod-opt rasp-rsync rasp-unmount ## init raspberry +rasp-init: rasp-chmod-opt rasp-setup-fstab rasp-rsync rasp-unmount ## init raspberry .PHONY: rasp-install rasp-install: rasp-install-pal ## setup raspberry @@ -155,6 +155,10 @@ glsl-glyphs-dungeon: ## glsl-glyphs --name dungeon forge-run: $(BUILD_DIR)/$(TARGET) ## ./build/forge $(BUILD_DIR)/$(TARGET) $(RUN_ARGS) +.PHONY: rasp-setup-fstab +rasp-setup-fstab: ## setup remote fstab to sync + sudo sed -i 's/defaults,noatime /defaults,noatime,sync /g' $(RASP_ROOTFS)/etc/fstab + .PHONY: rasp-chmod-opt rasp-chmod-opt: ## chmod remote project sudo chmod -R a+rwx $(RASP_ROOTFS)/opt