From 352c4542e4064e821d30db875e82904ef44b1c92 Mon Sep 17 00:00:00 2001
From: Anton Kling <anton@kling.gg>
Date: Mon, 30 Oct 2023 23:34:32 +0100
Subject: Meta: Fix build scripts to work on debian

---
 userland/test/Makefile         | 4 +---
 userland/windowserver/Makefile | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'userland')

diff --git a/userland/test/Makefile b/userland/test/Makefile
index 0e3b495..76cf844 100644
--- a/userland/test/Makefile
+++ b/userland/test/Makefile
@@ -1,12 +1,10 @@
 CC="i686-sb-gcc"
 CFLAGS = -O2 -Wall -Wextra -pedantic -Wimplicit-fallthrough -static
-LIB=-L../json -L../json/hashmap -ljson -lhashmap
-INC=-I../json/
 BINS=test
 all: $(BINS)
 
 test.o: test.c
-	$(CC) $(CFLAGS) $(INC) $(LIB) -o $@ -c $<
+	$(CC) $(CFLAGS) -o $@ -c $<
 
 test: test.o
 	$(CC) $(CFLAGS) -o $@ $^ $(LIB)
diff --git a/userland/windowserver/Makefile b/userland/windowserver/Makefile
index 65a50f6..7f80f2e 100644
--- a/userland/windowserver/Makefile
+++ b/userland/windowserver/Makefile
@@ -1,8 +1,8 @@
 CC="i686-sb-gcc"
-CFLAGS = -ggdb -ffreestanding -O2 -Wall -Wextra -pedantic -mgeneral-regs-only -Wimplicit-fallthrough -fsanitize=shift,signed-integer-overflow,bounds
+CFLAGS = -ggdb -ffreestanding -O2 -Wall -Wextra -pedantic -mgeneral-regs-only -Wimplicit-fallthrough
 BIN=ws
-LIB=-L../json -ljson -L../json/hashmap -lhashmap -L../libc -lc -lgcc
-INC=-I../json/ -I../libgui/
+LIB=-lgcc
+INC=-I../libgui/
 all: $(BIN)
 OBJ=ws.o draw.o
 
@@ -13,4 +13,4 @@ clean:
 	rm $(OBJ) ws
 
 $(BIN): $(OBJ)
-	$(CC) -o $(BIN) -ffreestanding -nostdlib $(CFLAGS) $(OBJ) $(LIB)
+	$(CC) -o $(BIN) $(CFLAGS) $(OBJ) $(LIB)
-- 
cgit v1.2.3