2 Commits
Author SHA1 Message Date
YourWishesandClaude Sonnet 5 d878463ccb Make script.h the one include for everything duskscript-related
Folds what used to be duskscriptnative.h's includes (builtin/value/array/
struct/promise helpers a native function needs) directly into script.h,
alongside the runtime and VM includes already there. scriptnativeconsole.h
now just includes "script/script.h" instead of enumerating the same list
itself - any new native function bindings can do the same.

Co-Authored-By: Claude Sonnet 5 <[email protected]>
2026-10-14 13:54:08 -05:00
YourWishesandClaude Sonnet 5 5d8337af7e Always build and init duskscript, remove the DUSK_SCRIPT option
Scripting is now a standard part of the engine rather than an optional
feature: removes the DUSK_SCRIPT CMake option and its compile definition,
makes src/dusk/CMakeLists.txt add_subdirectory(script) unconditionally, and
drops the #ifdef DUSK_SCRIPT guards around scriptInit()/scriptDispose() in
engine.c. duskscriptcc and its test still only build on the linux/knulli
host target (it's a dev tool, not part of the runtime), now gated on that
alone instead of DUSK_SCRIPT AND that.

Co-Authored-By: Claude Sonnet 5 <[email protected]>
2026-10-14 13:54:02 -05:00
7 changed files with 27 additions and 43 deletions

No files matched your search

-7
View File
@@ -17,7 +17,6 @@ cmake_policy(SET CMP0079 NEW)
option(DUSK_BUILD_TESTS "Enable tests" OFF)
option(DUSK_NETWORK "Enable network support" ON)
option(DUSK_SCRIPT "Enable scripting support" ON)
set(DUSK_GAME_NAME "Dusk" CACHE STRING "Game display name")
set(DUSK_GAME_AUTHOR "YourWishes" CACHE STRING "Game author / coder")
@@ -111,12 +110,6 @@ if(DUSK_NETWORK)
)
endif()
if(DUSK_SCRIPT)
target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
DUSK_SCRIPT
)
endif()
# Toolchains
include(cmake/targets/${DUSK_TARGET_SYSTEM}.cmake)
+1 -4
View File
@@ -9,10 +9,7 @@ if(DUSK_NETWORK)
add_subdirectory(dusknetwork)
endif()
if(
DUSK_SCRIPT AND
(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "knulli")
)
if(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "knulli")
# The duskscript runtime itself lives in src/dusk/script, added
# unconditionally of platform there since it is plain, portable C; this is
# just the duskscriptcc compiler, a host tool only built on the dev machine.
+1 -3
View File
@@ -82,9 +82,7 @@ add_subdirectory(input)
add_subdirectory(locale)
add_subdirectory(perf)
add_subdirectory(rpg)
if(DUSK_SCRIPT)
add_subdirectory(script)
endif()
add_subdirectory(script)
add_subdirectory(scene)
add_subdirectory(system)
add_subdirectory(time)
+3 -9
View File
@@ -20,9 +20,7 @@
#ifdef DUSK_NETWORK
#include "network/network.h"
#endif
#ifdef DUSK_SCRIPT
#include "script/script.h"
#endif
#include "script/script.h"
#include "system/system.h"
#include "console/console.h"
#include "save/save.h"
@@ -55,9 +53,7 @@ errorret_t engineInit(const int32_t argc, const char_t **argv) {
#ifdef DUSK_NETWORK
errorChain(networkInit());
#endif
#ifdef DUSK_SCRIPT
errorChain(scriptInit());
#endif
errorChain(scriptInit());
errorChain(sceneInit());
consolePrint("Engine initialized");
@@ -101,9 +97,7 @@ void engineExit(void) {
errorret_t engineDispose(void) {
errorChain(sceneDispose());
#ifdef DUSK_SCRIPT
errorChain(scriptDispose());
#endif
errorChain(scriptDispose());
#ifdef DUSK_NETWORK
errorChain(networkDispose());
#endif
+1 -16
View File
@@ -6,22 +6,7 @@
*/
#pragma once
#include "dusk.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"
#include "script/script.h"
/**
* Registers the consolePrint(text) native, letting scripts write directly to
+20
View File
@@ -8,10 +8,30 @@
#pragma once
#include "dusk.h"
#include "error/error.h"
// Everything duskscript: values, the heap, the built in functions, running
// scripts, and the bytecode virtual machine that runs compiled ones.
#include "duskscript.h"
#include "image/scriptvmattach.h"
#include "image/scriptvmrun.h"
// What a native function needs: the types, the argument helpers and the value
// constructors. Include "script/script.h" for this, not these directly.
#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"
// The whole memory budget of the script context. The runtime never asks the
// system for more than this, see scriptRuntimeCreate.
#define SCRIPT_MEMORY_SIZE (512 * 1024)
+1 -4
View File
@@ -7,10 +7,7 @@ add_subdirectory(animation)
add_subdirectory(assert)
add_subdirectory(asset)
add_subdirectory(console)
if(
DUSK_SCRIPT AND
(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "knulli")
)
if(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "knulli")
add_subdirectory(duskscript)
endif()
add_subdirectory(error)