From 1489760011e6f637315f8e91308fe93cad69157c Mon Sep 17 00:00:00 2001 From: Yanis42 <35189056+Yanis42@users.noreply.github.com> Date: Tue, 9 Apr 2024 17:23:16 +0200 Subject: [PATCH 1/4] fix python for linux --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 85bd8cb1..cbc11098 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,10 @@ endif ifeq ($(OS),Windows_NT) WINE := + PYTHON ?= python else WINE := wine + PYTHON ?= python3.11 endif ROOT := $(shell pwd) @@ -110,7 +112,7 @@ clean: .PHONY: lcf lcf: setup $(TOOLS_DIR)/lcf.py - python $(TOOLS_DIR)/lcf.py + $(PYTHON) $(TOOLS_DIR)/lcf.py $(ASM_OBJS): $(TARGET_DIR)/%.o: % mkdir -p $(dir $@) @@ -135,4 +137,4 @@ $(OV_LZS): %.lz: %.bin gen_externs: $(ASM_INCS) $(ASM_INCS): %.inc: %.s - python $(TOOLS_DIR)/gen_externs.py $< + $(PYTHON) $(TOOLS_DIR)/gen_externs.py $< From fe949e88d8859fbde7b96f4d8272db9e1f1925f2 Mon Sep 17 00:00:00 2001 From: Yanis42 <35189056+Yanis42@users.noreply.github.com> Date: Tue, 9 Apr 2024 17:30:07 +0200 Subject: [PATCH 2/4] default to ``python`` --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cbc11098..8efdc6de 100644 --- a/Makefile +++ b/Makefile @@ -8,9 +8,10 @@ else ifneq ($(REGION),) $(error Unknown region '$(REGION)') endif +PYTHON ?= python + ifeq ($(OS),Windows_NT) WINE := - PYTHON ?= python else WINE := wine PYTHON ?= python3.11 From 2a0c8a4dda188a0b6a50567f2ef7d94fc31fbd3b Mon Sep 17 00:00:00 2001 From: Yanis42 <35189056+Yanis42@users.noreply.github.com> Date: Tue, 9 Apr 2024 17:46:08 +0200 Subject: [PATCH 3/4] fixed note and wrong link in CONTRIBUTING.md --- CONTRIBUTING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5a50b683..24b454cc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -136,4 +136,5 @@ be inserted instead of `asm.inc`. When contributing non-matching functions to this project, please build in both modes and fix any build errors you may get. Delete the `.o` file between building in each mode so that the `Makefile` runs the compiler both times. -> [!NOTE] The inline assembler does not function the same as the standalone assembler. [See differences here.](inline_assembler.md#differences-from-standalone-assembler) +> [!NOTE] +> The inline assembler does not function the same as the standalone assembler. [See differences here.](docs/inline_assembler.md#differences-from-standalone-assembler) From c2d1e9b2f8a46fe68078926fa9e191ff62c4e167 Mon Sep 17 00:00:00 2001 From: Yanis42 <35189056+Yanis42@users.noreply.github.com> Date: Thu, 11 Apr 2024 01:46:45 +0200 Subject: [PATCH 4/4] review --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8efdc6de..96bb50db 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,6 @@ else ifneq ($(REGION),) $(error Unknown region '$(REGION)') endif -PYTHON ?= python - ifeq ($(OS),Windows_NT) WINE := else @@ -17,6 +15,8 @@ else PYTHON ?= python3.11 endif +PYTHON ?= python + ROOT := $(shell pwd) BUILD_DIR := build TARGET_DIR := $(BUILD_DIR)/$(REGION_NAME)