diff options
| -rw-r--r-- | drivers/GPUBasic.drv/GPUBasic.drv.json | 21 | ||||
| -rw-r--r-- | drivers/GPUBasic.drv/dist/.keep | 0 | ||||
| -rw-r--r-- | drivers/X11.drv/X11.drv.json (renamed from drivers/X11.drv/X11.json) | 2 | ||||
| m--------- | src/kernel | 0 | ||||
| -rwxr-xr-x | updater/updater.py | 8 |
5 files changed, 26 insertions, 5 deletions
diff --git a/drivers/GPUBasic.drv/GPUBasic.drv.json b/drivers/GPUBasic.drv/GPUBasic.drv.json new file mode 100644 index 0000000..49c4fe6 --- /dev/null +++ b/drivers/GPUBasic.drv/GPUBasic.drv.json @@ -0,0 +1,21 @@ +{ + "compiler_path": "x86_64-w64-mingw32-g++", + "compiler_std": "c++20", + "headers_path": ["../", "./", "../src/kernel/src", "../src/kernel/src/kernel"], + "sources_path": ["src/*.cc"], + "output_name": "./dist/gpubasic.ddk.out", + "compiler_flags": [ + "-ffreestanding", + "-shared", + "-fno-rtti", + "-fno-exceptions", + "-Wl,--subsystem=17" + ], + "cpp_macros": [ + "kKTVersion=0x0100", + "kKTVersionHighest=0x0100", + "kKTVersionLowest=0x0100", + "__NE_AMD64__" + ] + } + diff --git a/drivers/GPUBasic.drv/dist/.keep b/drivers/GPUBasic.drv/dist/.keep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/drivers/GPUBasic.drv/dist/.keep diff --git a/drivers/X11.drv/X11.json b/drivers/X11.drv/X11.drv.json index a53c801..7bc61c5 100644 --- a/drivers/X11.drv/X11.json +++ b/drivers/X11.drv/X11.drv.json @@ -1,7 +1,7 @@ { "compiler_path": "x86_64-w64-mingw32-g++", "compiler_std": "c++20", - "headers_path": ["../", "./", "../../../src", "../../../src/kernel"], + "headers_path": ["../", "./", "../src/kernel/src/", "../src/kernel/src/kernel"], "sources_path": ["src/*.cc"], "output_name": "./dist/x11.ddk.out", "compiler_flags": [ diff --git a/src/kernel b/src/kernel -Subproject 999f4e4dc191eb710abfc691043c5a0da9eadee +Subproject bf2892edf4185326c0d47d16106eaead05859f0 diff --git a/updater/updater.py b/updater/updater.py index 0f6f855..f6a19e4 100755 --- a/updater/updater.py +++ b/updater/updater.py @@ -6,10 +6,10 @@ from os import system class UpdateFunctor: def __init__(self): - system("cd libs && cd kernel && git pull && cd ..") - system("cd libs && cd nectar && git pull && cd ..") - system("cd libs && cd build && git pull && cd ..") - system("cd libs && cd boot && git pull && cd ..") + system("cd src && cd kernel && git pull && cd ..") + system("cd src && cd nectar && git pull && cd ..") + system("cd src && cd build && git pull && cd ..") + system("cd src && cd boot && git pull && cd ..") system("cd papers && git pull") system("git add src/kernel src/nectar papers src/build src/boot") system("git commit -s -S") |