Merge branch 'master' into dev

This commit is contained in:
mibi88 2023-07-18 16:28:00 +02:00
commit 6536afd6ec
3 changed files with 3 additions and 1 deletions

View File

@ -26,6 +26,7 @@ all: $(OBJ) | $(OUT_DIR)/
$(AR) rsv $(OUT_DIR)/$(OUT) $(addprefix build/, $(notdir $(OBJ)))
cp --recursive include $(OUT_DIR)/
cp src/fx98xx.ld $(OUT_DIR)/
rm -fr $(BUILD)
$(BUILD)/%.o: src/% | $(BUILD)/
$(CC) -c $< -o build/$(notdir $@) $(CFLAGS)

View File

@ -1,5 +1,5 @@
#include "../../include/microfx/ext/img.h"
#include <microfx/microfx.h>
#include "../../include/microfx/microfx.h"
void simage(int sx, int sy, int w, int h, unsigned char *img, int mode) {
/* Draws an image from a sprite coder string */

View File

@ -19,6 +19,7 @@ VERSION = v.1.0
all: $(BIN)
fxgxa --g1a -n $(NAME) -i $(ICON) --version="$(VERSION)" -o $(NAME).g1a build/$(BIN)
sh-elf-objdump -h $(BUILD)/$(ELF)
rm -fr $(BUILD)
$(BIN): $(ELF)
sh-elf-objcopy -O binary build/$(ELF) build/$(BIN) -R .bss