Bug fix and makefile improvement

kot-org · Aug 17, 2024 · 0cddfda · 0cddfda
1 parent 977cd81
commit 0cddfda
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/bootstrap/sys-apps.yml b/bootstrap/sys-apps.yml
@@ -243,6 +243,7 @@ packages:
       - host-gcc
     pkgs_required:
       - mlibc
+      - cjson
       - freetype
       - libjpeg
       - kot-graphics

diff --git a/makefile b/makefile
@@ -41,6 +41,11 @@ update:
 run:
 	@ cd target && BOOT_DEVICE=$(BOOT_DEVICE) LC_ALL=C make $(TARGET)/run
 
+clean_build:
+	@ rm -f target/$(TARGET)/boot-kot.img
+	@ cd target && BOOT_DEVICE=$(BOOT_DEVICE) LC_ALL=C PACKAGE=all make $(TARGET)/build
+	@ cp target/$(TARGET)/boot-kot.img target/$(TARGET)/clean-boot-kot.img
+
 all: init build run
 
 github-action: deps-debian init build

diff --git a/sources/core/apps/welcome/target/amd64/makefile b/sources/core/apps/welcome/target/amd64/makefile
@@ -34,7 +34,7 @@ $(LIB)/%_c.o: $(SOURCE)/%.c
 
 link:
 	@ mkdir -m 777 -p $(BIN)
-	$(CC) $(LDFLAGS) -o $(BIN)/welcome $(OBJS) $(LIBRARIES)/libkot-graphics.a $(LIBRARIES)/libfreetype.a $(LIBRARIES)/libz.a $(LIBRARIES)/libturbojpeg.a$(LIBRARIES)/libcjson.a
+	$(CC) $(LDFLAGS) -o $(BIN)/welcome $(OBJS) $(LIBRARIES)/libkot-graphics.a $(LIBRARIES)/libfreetype.a $(LIBRARIES)/libz.a $(LIBRARIES)/libturbojpeg.a
 
 copy_res:
 	@ mkdir -m 777 -p $(BIN)/res/welcome