diff --git a/Rsconscript b/Rsconscript index b06e9d7..99bdf26 100644 --- a/Rsconscript +++ b/Rsconscript @@ -73,10 +73,10 @@ end hello_env = env "hello", use: %w[ldc2 x86_64-w64-mingw32-gcc] do |env| env.add_builder(Image) - env["sources"] = glob("src/hello/**/*.d", "src/kernel/hos/bootinfo.d") + env["sources"] = glob("src/hello/**/*.d", "src/hulk/hulk/bootinfo.d") env["sources"] += glob("uefi-d/source/**/*.d") env["DFLAGS"] += %w[-mtriple=x86_64-unknown-windows-coff --betterC -release -O3 --wi] - env["D_IMPORT_PATH"] += %w[src/hello src/kernel uefi-d/source] + env["D_IMPORT_PATH"] += %w[src/hello src/hulk uefi-d/source] env["LD"] = "x86_64-w64-mingw32-gcc" env["LDFLAGS"] += %w[-nostdlib -Wl,-dll -shared -Wl,--subsystem,10 -e efi_main -Wl,-Map,${_TARGET}.map] env["LDCMD"] = %w[${LD} -o ${_TARGET} ${LDFLAGS} ${_SOURCES} ${LIBDIRPREFIX}${LIBPATH} ${LIBLINKPREFIX}${LIBS}] diff --git a/src/hello/hello.d b/src/hello/hello.d index 0d7913f..7e0006d 100644 --- a/src/hello/hello.d +++ b/src/hello/hello.d @@ -1,6 +1,6 @@ import uefi; import output; -import hos.bootinfo; +import hulk.bootinfo; __gshared EFI_SYSTEM_TABLE * st; __gshared BootInfo bootinfo; diff --git a/src/kernel/hos/bootinfo.d b/src/hulk/hulk/bootinfo.d similarity index 100% rename from src/kernel/hos/bootinfo.d rename to src/hulk/hulk/bootinfo.d