commit b2be907

uint  ·  2026-05-13 12:53:19 +0000 UTC
parent 5780131
add platform configure script, rename util.c->utils.c
6 files changed,  +39, -11
+2, -0
1@@ -3,4 +3,6 @@ cterm
2 *.o
3 *.swp
4 *.swo
5+platform.mk
6+*.ttf
7 
+2, -6
 1@@ -3,14 +3,10 @@ CFLAGS = -std=c99 -Wall -Wextra
 2 CPPFLAGS = -Isource/external -Isource/include
 3 LDFLAGS = -lschrift -lgrapheme -lm
 4 
 5-# X11
 6-#LDFLAGS += -lX11 -lXrandr
 7-
 8-# macOS
 9-# LDFLAGS += -framework Cocoa -framework CoreVideo -framework IOKit -framework CoreGraphics -framework CoreFoundation -framework Carbon
10+include platform.mk
11 
12 SRCS = source/cterm.c \
13-       source/util.c  \
14+       source/utils.c  \
15        source/font.c  \
16        source/term.c  \
17        source/draw.c
+30, -0
 1@@ -0,0 +1,30 @@
 2+#!/bin/sh
 3+
 4+PLATFORM=$(uname)
 5+
 6+LINUX_LDFLAGS="-lX11 -lXrandr"
 7+FREEBSD_LDFLAGS="-lX11 -lXrandr"
 8+OPENBSD_LDFLAGS="-I/usr/X11R6/include -L/usr/X11R6/lib -lX11 -lXrandr"
 9+MACOS_LDFLAGS="-framework Cocoa -framework CoreVideo -framework IOKit -framework CoreGraphics -framework CoreFoundation -framework Carbon"
10+
11+{
12+	case "$PLATFORM" in
13+		Linux)
14+			echo "LDFLAGS += $LINUX_LDFLAGS"
15+			;;
16+		FreeBSD)
17+			echo "LDFLAGS += $FREEBSD_LDFLAGS"
18+			;;
19+		OpenBSD)
20+			echo "LDFLAGS += $OPENBSD_LDFLAGS"
21+			;;
22+		Darwin)
23+			echo "LDFLAGS += $MACOS_LDFLAGS"
24+			;;
25+		*) # some better default option
26+			echo "Unsupported platform: $PLATFORM" >&2
27+			exit 1
28+			;;
29+	esac
30+} > platform.mk
31+
+1, -1
1@@ -9,7 +9,7 @@
2 #include "draw.h"
3 #include "font.h"
4 #include "term.h"
5-#include "util.h"
6+#include "utils.h"
7 
8 #define WIDTH  800
9 #define HEIGHT 600
R source/include/util.h => source/include/utils.h
+3, -3
 1@@ -1,5 +1,5 @@
 2-#ifndef UTIL_H
 3-#define UTIL_H
 4+#ifndef UTILS_H
 5+#define UTILS_H
 6 
 7 #include <stddef.h>
 8 #include <stdint.h>
 9@@ -31,5 +31,5 @@ uint32_t rgba(uint8_t r, uint8_t g, uint8_t b, uint8_t a);
10  */
11 void* xmalloc(size_t len);
12 
13-#endif /* UTIL_H */
14+#endif /* UTILS_H */
15 
R source/util.c => source/utils.c
+1, -1
1@@ -1,7 +1,7 @@
2 #include <stdio.h>
3 #include <stdlib.h>
4 
5-#include "util.h"
6+#include "utils.h"
7 
8 /* TODO: stdarg */
9 void die(int ec, const char* msg)