Aren
/
toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Decoration themes should be no different from other libraries

This commit is contained in:
K. Lange 2018-04-17 22:39:39 +09:00 committed by Kevin Lange
parent e753f83c48
commit 592541ef7f
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -131,11 +131,6 @@ base/lib/ld.so: linker/linker.c base/lib/libc.a | dirs
-include ${LIBS_Y}
# Decoration Themes
base/lib/libtoaru-decor-fancy.so: decors/decor-fancy.c base/usr/include/toaru/decorations.h base/lib/libtoaru_graphics.so base/lib/libtoaru_decorations.so base/lib/libtoaru_drawstring.so ${LC}
$(CC) -o $@ $(CFLAGS) -shared -fPIC $< -ltoaru_decorations -ltoaru_drawstring -ltoaru_graphics
# Init
base/bin/init: apps/init.c base/lib/libc.a | dirs
@ -150,7 +145,7 @@ base/bin/init: apps/init.c base/lib/libc.a | dirs
# Ramdisk
cdrom/ramdisk.img: ${APPS_X} base/lib/ld.so base/lib/libtoaru-decor-fancy.so Makefile | dirs
cdrom/ramdisk.img: ${APPS_X} ${LIBS_X} base/lib/ld.so Makefile | dirs
genext2fs -B 4096 -d base -U -b 4096 -N 2048 cdrom/ramdisk.img

0
decors/decor-fancy.c → lib/decor-fancy.c
View File

2
lib/decorations.c
View File

@ -126,7 +126,7 @@ void init_decorations() {
options++;
}
char lib_name[100];
sprintf(lib_name, "libtoaru-decor-%s.so", theme);
sprintf(lib_name, "libtoaru_decor-%s.so", theme);
void * theme_lib = dlopen(lib_name, 0);
if (!theme_lib) {
goto _theme_error;