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

some build fixes

Browse Source
This commit is contained in:
K. Lange 2018-02-25 17:43:31 +09:00 committed by Kevin Lange
parent 9fc8d6700c
commit c0e5bd7d26
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -77,7 +77,7 @@ base/bin/sh: sh.c base/lib/libnihc.so base/lib/libtoaru_list.so base/lib/libtoar
base/bin/hello: hello.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/bin/hello: hello.c base/lib/libnihc.so base/lib/libtoaru_graphics.so
$(CC) $(CFLAGS) -o $@ $< -ltoaru_graphics $(LIBS) $(CC) $(CFLAGS) -o $@ $< -ltoaru_graphics $(LIBS)
base/bin/terminal: terminal.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_yutani.so base/lib/libtoaru_decorations.so base/lib/libtoaru_dlfcn.so base/lib/libtoaru_list.so base/lib/libtoaru_kbd.so base/lib/libtoaru_termemu.so base/bin/terminal: terminal.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_yutani.so base/lib/libtoaru_decorations.so base/lib/libtoaru_dlfcn.so base/lib/libtoaru_list.so base/lib/libtoaru_kbd.so base/lib/libtoaru_termemu.so base/lib/libtoaru_pex.so base/lib/libtoaru_hashmap.so
$(CC) $(CFLAGS) -o $@ $< -ltoaru_termemu -ltoaru_decorations -ltoaru_yutani -ltoaru_graphics -ltoaru_pex -ltoaru_hashmap -ltoaru_dlfcn -ltoaru_kbd -ltoaru_list $(LIBS) $(CC) $(CFLAGS) -o $@ $< -ltoaru_termemu -ltoaru_decorations -ltoaru_yutani -ltoaru_graphics -ltoaru_pex -ltoaru_hashmap -ltoaru_dlfcn -ltoaru_kbd -ltoaru_list $(LIBS)
base/bin/background: background.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_yutani.so base/lib/libtoaru_pthread.so base/bin/background: background.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_yutani.so base/lib/libtoaru_pthread.so
@ -103,3 +103,10 @@ cdrom/ramdisk.img.gz: ${APPS_X} base/lib/ld.so | dirs
image.iso: cdrom/ramdisk.img.gz image.iso: cdrom/ramdisk.img.gz
grub-mkrescue -d /usr/lib/grub/i386-pc --compress=xz -o $@ cdrom grub-mkrescue -d /usr/lib/grub/i386-pc --compress=xz -o $@ cdrom
.PHONY: clean
clean:
rm -f base/lib/*.so
rm -f base/lib/libnihc.a
rm -f libc/*.o
rm -f image.iso
rm -f cdrom/randisk.img.gz

1
include/math.h
View File

@ -3,3 +3,4 @@
extern double floor(double x); extern double floor(double x);
extern int abs(int j); extern int abs(int j);
double exp(double x); double exp(double x);

2
include/stdio.h
View File

@ -37,5 +37,7 @@ extern int printf(char *fmt, ...);
extern int fputs(const char *s, FILE *stream); extern int fputs(const char *s, FILE *stream);
extern int fputc(int c, FILE *stream); extern int fputc(int c, FILE *stream);
extern int fgetc(FILE *stream); extern int fgetc(FILE *stream);
extern char *fgets(char *s, int size, FILE *stream);
extern void rewind(FILE *stream);
extern void setbuf(FILE * stream, char * buf); extern void setbuf(FILE * stream, char * buf);

1
libc/pwd.c
View File

@ -11,6 +11,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <errno.h> #include <errno.h>
#include <pwd.h> #include <pwd.h>