From fbd66a804e019b8c6263013be6ced23e9b6a60ae Mon Sep 17 00:00:00 2001 From: boreddevnl Date: Sat, 9 May 2026 19:29:18 +0200 Subject: [PATCH] lib: Copy stb_image into TCC lib --- Makefile | 2 +- src/userland/Makefile | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 4ab85fb..ba62921 100644 --- a/Makefile +++ b/Makefile @@ -248,6 +248,7 @@ $(BUILD_DIR)/initrd.tar: $(KERNEL_ELF) @cp $(SRC_DIR)/userland/libc/sys/*.h $(BUILD_DIR)/initrd/usr/include/sys/ @cp $(SRC_DIR)/userland/libc/*.h $(BUILD_DIR)/initrd/usr/include/libc/ @cp $(SRC_DIR)/userland/libc/*.h $(BUILD_DIR)/initrd/usr/local/include/ + @cp $(SRC_DIR)/userland/stb_image.h $(BUILD_DIR)/initrd/usr/include/ @printf "$(YELLOW)[COPY]$(RESET) Wallpapers..." @for f in $(SRC_DIR)/images/wallpapers/*; do \ @@ -327,7 +328,6 @@ $(BUILD_DIR)/initrd.tar: $(KERNEL_ELF) @if [ -f README.md ]; then printf " -> README.md"; cp README.md $(BUILD_DIR)/initrd/; fi @if [ -f LICENSE ]; then printf " -> LICENSE"; cp LICENSE $(BUILD_DIR)/initrd/; fi @if [ -f limine.conf ]; then printf " -> limine.conf"; cp limine.conf $(BUILD_DIR)/initrd/; fi - @if [ -f $(SRC_DIR)/userland/gui/about.c ]; then printf " -> about.c"; cp $(SRC_DIR)/userland/gui/about.c $(BUILD_DIR)/initrd/; fi @printf "$(YELLOW)[TAR]$(RESET) Creating initrd.tar..." cd $(BUILD_DIR)/initrd && COPYFILE_DISABLE=1 tar --exclude="._*" -cf ../initrd.tar * diff --git a/src/userland/Makefile b/src/userland/Makefile index 2811513..a6ac9ab 100644 --- a/src/userland/Makefile +++ b/src/userland/Makefile @@ -20,7 +20,7 @@ $(if $(filter doom,$1),$(APP_METADATA_SOURCE_DOOM),$(if $(filter lua,$1),$(APP_M endef LIBC_SOURCES = $(wildcard libc/*.c) -LIBC_OBJS = $(patsubst libc/%.c, $(BIN_DIR)/%.o, $(LIBC_SOURCES)) $(BIN_DIR)/crt0.o $(BIN_DIR)/libwidget.o +LIBC_OBJS = $(patsubst libc/%.c, $(BIN_DIR)/%.o, $(LIBC_SOURCES)) $(BIN_DIR)/crt0.o $(BIN_DIR)/libwidget.o $(BIN_DIR)/stb_image.o VPATH = cli gui sys games libc net cli/third_party vpath %.c cli gui sys games libc net cli/third_party @@ -74,25 +74,25 @@ $(BIN_DIR)/%.note.o: $(BIN_DIR)/%.note.c $(BIN_DIR)/%.o: %.c | $(BIN_DIR) $(CC) $(CFLAGS) -c $< -o $@ -$(BIN_DIR)/viewer.elf: $(LIBC_OBJS) $(BIN_DIR)/viewer.o $(BIN_DIR)/stb_image.o $(BIN_DIR)/viewer.note.o +$(BIN_DIR)/viewer.elf: $(LIBC_OBJS) $(BIN_DIR)/viewer.o $(BIN_DIR)/viewer.note.o $(LD) $(LDFLAGS) $^ -o $@ -$(BIN_DIR)/about.elf: $(LIBC_OBJS) $(BIN_DIR)/about.o $(BIN_DIR)/stb_image.o $(BIN_DIR)/about.note.o +$(BIN_DIR)/about.elf: $(LIBC_OBJS) $(BIN_DIR)/about.o $(BIN_DIR)/about.note.o $(LD) $(LDFLAGS) $^ -o $@ -$(BIN_DIR)/settings.elf: $(LIBC_OBJS) $(BIN_DIR)/settings.o $(BIN_DIR)/stb_image.o $(BIN_DIR)/settings.note.o +$(BIN_DIR)/settings.elf: $(LIBC_OBJS) $(BIN_DIR)/settings.o $(BIN_DIR)/settings.note.o $(LD) $(LDFLAGS) $^ -o $@ -$(BIN_DIR)/browser.elf: $(LIBC_OBJS) $(BIN_DIR)/browser.o $(BIN_DIR)/stb_image.o $(BIN_DIR)/browser.note.o +$(BIN_DIR)/browser.elf: $(LIBC_OBJS) $(BIN_DIR)/browser.o $(BIN_DIR)/browser.note.o $(LD) $(LDFLAGS) $^ -o $@ -$(BIN_DIR)/screenshot.elf: $(LIBC_OBJS) $(BIN_DIR)/screenshot.o $(BIN_DIR)/stb_image.o $(BIN_DIR)/screenshot.note.o +$(BIN_DIR)/screenshot.elf: $(LIBC_OBJS) $(BIN_DIR)/screenshot.o $(BIN_DIR)/screenshot.note.o $(LD) $(LDFLAGS) $^ -o $@ $(BIN_DIR)/%.o: games/doom/%.c | $(BIN_DIR) $(CC) $(CFLAGS) -Wno-error -DBOREDOS -Igames/doom -c $< -o $@ -$(BIN_DIR)/doom.elf: $(LIBC_OBJS) $(DOOM_OBJS) $(BIN_DIR)/stb_image.o $(BIN_DIR)/doom.note.o +$(BIN_DIR)/doom.elf: $(LIBC_OBJS) $(DOOM_OBJS) $(BIN_DIR)/doom.note.o $(LD) $(LDFLAGS) $^ -o $@ $(BIN_DIR)/%.elf: $(LIBC_OBJS) $(BIN_DIR)/%.o $(BIN_DIR)/%.note.o