diff options
author | Benji Dial <benji@benjidial.net> | 2024-07-29 19:59:52 -0400 |
---|---|---|
committer | Benji Dial <benji@benjidial.net> | 2024-07-29 19:59:52 -0400 |
commit | e6c3a80b01ffb52079783cddd9be6d392d0f7039 (patch) | |
tree | 148276b9878f287bc81638f90249ec4d7b86eaf0 /makefile | |
parent | be691582ee12613278af24cb5a824eeb357f6324 (diff) | |
download | hilbert-os-e6c3a80b01ffb52079783cddd9be6d392d0f7039.tar.gz |
redesign compositor protocol, start widget library
Diffstat (limited to 'makefile')
-rw-r--r-- | makefile | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -8,7 +8,7 @@ HILBERT_NASM = nasm -f elf64 HILBERT_CC = ${TOOLCHAIN_DIR}/usr/bin/x86_64-elf-c++ -std=c++20 \ ${EXTRA_CC_ARGS} -static -mno-sse -I include -I $(abspath euler/include) \ -I $(abspath libraries/daguerre/include) -I ${MINTSUKI_HEADERS_DIR} \ - -I $(abspath libraries/goldman/include) + -I $(abspath libraries/pake/include) HILBERT_AR = ${TOOLCHAIN_DIR}/usr/bin/x86_64-elf-ar HILBERT_LD = ${TOOLCHAIN_DIR}/usr/bin/x86_64-elf-ld -z noexecstack @@ -25,6 +25,7 @@ LIBSTDCPP_DEP = toolchain/.libstdcpp-done EULER_DEP = toolchain/.euler-done DAGUERRE_DEP = toolchain/.daguerre-done +PAKE_DEP = toolchain/.pake-done APP_DEPS = ${EULER_DEP} LIBRARY_DEPS = ${LIBSTDCPP_DEP} @@ -37,13 +38,14 @@ run: build/disk.iso gdb -x qemu.gdb clean: - rm -rf build ${EULER_DEP} ${DAGUERRE_DEP} + rm -rf build ${EULER_DEP} ${DAGUERRE_DEP} ${PAKE_DEP} make -C euler clean make -C kernel clean make -C applications/init clean make -C applications/goldman clean make -C applications/hello clean make -C libraries/daguerre clean + make -C libraries/pake clean clean-dependencies: clean rm -rf toolchain dependencies @@ -110,6 +112,11 @@ ${DAGUERRE_DEP}: ${LIBRARY_DEPS} cp libraries/daguerre/build/libdaguerre.a ${LIB_DIR}/ touch $@ +${PAKE_DEP}: ${LIBRARY_DEPS} + +make -C libraries/pake build/libpake.a + cp libraries/pake/build/libpake.a ${LIB_DIR}/ + touch $@ + kernel/build/kernel.elf: ${GCC_DEP} ${MINTSUKI_HEADERS_DEP} ${LIMINE_DEP} +make -C kernel build/kernel.elf @@ -119,7 +126,7 @@ applications/init/build/init.elf: ${APP_DEPS} applications/goldman/build/goldman.elf: ${APP_DEPS} ${DAGUERRE_DEP} +make -C applications/goldman build/goldman.elf -applications/hello/build/hello.elf: ${APP_DEPS} ${DAGUERRE_DEP} +applications/hello/build/hello.elf: ${APP_DEPS} ${DAGUERRE_DEP} ${PAKE_DEP} +make -C applications/hello build/hello.elf build/initfs.tgz: applications/init/build/init.elf \ |