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]>
This commit is contained in:
YourWishesandClaude Sonnet 5 committed 2026-10-14 13:54:02 -05:00
1 parent 6d056560e7
commit 5d8337af7e
5 files changed
+4 -25

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_BUILD_TESTS "Enable tests" OFF)
option(DUSK_NETWORK "Enable network support" ON) 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_NAME "Dusk" CACHE STRING "Game display name")
set(DUSK_GAME_AUTHOR "YourWishes" CACHE STRING "Game author / coder") set(DUSK_GAME_AUTHOR "YourWishes" CACHE STRING "Game author / coder")
@@ -111,12 +110,6 @@ if(DUSK_NETWORK)
) )
endif() endif()
if(DUSK_SCRIPT)
target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
DUSK_SCRIPT
)
endif()
# Toolchains # Toolchains
include(cmake/targets/${DUSK_TARGET_SYSTEM}.cmake) include(cmake/targets/${DUSK_TARGET_SYSTEM}.cmake)
+1 -4
View File
@@ -9,10 +9,7 @@ if(DUSK_NETWORK)
add_subdirectory(dusknetwork) add_subdirectory(dusknetwork)
endif() endif()
if( if(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "knulli")
DUSK_SCRIPT AND
(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "knulli")
)
# The duskscript runtime itself lives in src/dusk/script, added # The duskscript runtime itself lives in src/dusk/script, added
# unconditionally of platform there since it is plain, portable C; this is # 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. # 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(locale)
add_subdirectory(perf) add_subdirectory(perf)
add_subdirectory(rpg) add_subdirectory(rpg)
if(DUSK_SCRIPT) add_subdirectory(script)
add_subdirectory(script)
endif()
add_subdirectory(scene) add_subdirectory(scene)
add_subdirectory(system) add_subdirectory(system)
add_subdirectory(time) add_subdirectory(time)
+1 -7
View File
@@ -20,9 +20,7 @@
#ifdef DUSK_NETWORK #ifdef DUSK_NETWORK
#include "network/network.h" #include "network/network.h"
#endif #endif
#ifdef DUSK_SCRIPT #include "script/script.h"
#include "script/script.h"
#endif
#include "system/system.h" #include "system/system.h"
#include "console/console.h" #include "console/console.h"
#include "save/save.h" #include "save/save.h"
@@ -55,9 +53,7 @@ errorret_t engineInit(const int32_t argc, const char_t **argv) {
#ifdef DUSK_NETWORK #ifdef DUSK_NETWORK
errorChain(networkInit()); errorChain(networkInit());
#endif #endif
#ifdef DUSK_SCRIPT
errorChain(scriptInit()); errorChain(scriptInit());
#endif
errorChain(sceneInit()); errorChain(sceneInit());
consolePrint("Engine initialized"); consolePrint("Engine initialized");
@@ -101,9 +97,7 @@ void engineExit(void) {
errorret_t engineDispose(void) { errorret_t engineDispose(void) {
errorChain(sceneDispose()); errorChain(sceneDispose());
#ifdef DUSK_SCRIPT
errorChain(scriptDispose()); errorChain(scriptDispose());
#endif
#ifdef DUSK_NETWORK #ifdef DUSK_NETWORK
errorChain(networkDispose()); errorChain(networkDispose());
#endif #endif
+1 -4
View File
@@ -7,10 +7,7 @@ add_subdirectory(animation)
add_subdirectory(assert) add_subdirectory(assert)
add_subdirectory(asset) add_subdirectory(asset)
add_subdirectory(console) add_subdirectory(console)
if( if(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "knulli")
DUSK_SCRIPT AND
(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "knulli")
)
add_subdirectory(duskscript) add_subdirectory(duskscript)
endif() endif()
add_subdirectory(error) add_subdirectory(error)