diff --git a/src/dusk/script/CMakeLists.txt b/src/dusk/script/CMakeLists.txt index 69580e52..1a48a463 100644 --- a/src/dusk/script/CMakeLists.txt +++ b/src/dusk/script/CMakeLists.txt @@ -17,9 +17,9 @@ target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC m) target_sources(${DUSK_LIBRARY_TARGET_NAME} PUBLIC script.c - scriptnativeconsole.c ) # Subdirs add_subdirectory(core) add_subdirectory(vm) +add_subdirectory(native) diff --git a/src/dusk/script/core/duskscriptnative.h b/src/dusk/script/core/duskscriptnative.h deleted file mode 100644 index 917d5fb2..00000000 --- a/src/dusk/script/core/duskscriptnative.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (c) 2026 Dominic Masters - * - * This software is released under the MIT License. - * https://opensource.org/licenses/MIT - */ - -#pragma once - -// What a native function needs, the types, the argument helpers and the value -// constructors. - -#include "duskscript.h" -#include "scripttypes.h" -#include "builtin/scriptbuiltin.h" -#include "builtin/scriptarg.h" -#include "builtin/scriptbuiltinregister.h" -#include "error/scriptraise.h" -#include "value/scriptvalueprimitive.h" -#include "string/scriptstringnew.h" -#include "array/scriptarraynew.h" -#include "array/scriptarraymodify.h" -#include "struct/scriptstruct.h" -#include "promise/scriptpromisenew.h" -#include "promise/scriptpromisesettle.h" -#include "promise/scripttimer.h" -#include "runtime/scriptruntimeload.h" diff --git a/src/dusk/script/native/CMakeLists.txt b/src/dusk/script/native/CMakeLists.txt new file mode 100644 index 00000000..eddf09b3 --- /dev/null +++ b/src/dusk/script/native/CMakeLists.txt @@ -0,0 +1,9 @@ +# Copyright (c) 2026 Dominic Masters +# +# This software is released under the MIT License. +# https://opensource.org/licenses/MIT + +target_sources(${DUSK_LIBRARY_TARGET_NAME} + PUBLIC + scriptnativeconsole.c +) diff --git a/src/dusk/script/scriptnativeconsole.c b/src/dusk/script/native/scriptnativeconsole.c similarity index 100% rename from src/dusk/script/scriptnativeconsole.c rename to src/dusk/script/native/scriptnativeconsole.c diff --git a/src/dusk/script/scriptnativeconsole.h b/src/dusk/script/native/scriptnativeconsole.h similarity index 58% rename from src/dusk/script/scriptnativeconsole.h rename to src/dusk/script/native/scriptnativeconsole.h index 6b20c7e7..ec88a76f 100644 --- a/src/dusk/script/scriptnativeconsole.h +++ b/src/dusk/script/native/scriptnativeconsole.h @@ -7,7 +7,21 @@ #pragma once #include "dusk.h" -#include "duskscriptnative.h" +#include "duskscript.h" +#include "scripttypes.h" +#include "builtin/scriptbuiltin.h" +#include "builtin/scriptarg.h" +#include "builtin/scriptbuiltinregister.h" +#include "error/scriptraise.h" +#include "value/scriptvalueprimitive.h" +#include "string/scriptstringnew.h" +#include "array/scriptarraynew.h" +#include "array/scriptarraymodify.h" +#include "struct/scriptstruct.h" +#include "promise/scriptpromisenew.h" +#include "promise/scriptpromisesettle.h" +#include "promise/scripttimer.h" +#include "runtime/scriptruntimeload.h" /** * Registers the consolePrint(text) native, letting scripts write directly to diff --git a/src/dusk/script/script.c b/src/dusk/script/script.c index 6415f6e4..48ee0caa 100644 --- a/src/dusk/script/script.c +++ b/src/dusk/script/script.c @@ -6,7 +6,7 @@ */ #include "script.h" -#include "scriptnativeconsole.h" +#include "native/scriptnativeconsole.h" #include "builtin/scriptbuiltinregister.h" #include "console/console.h" #include "util/memory.h"