diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c0c767b..2aae71f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 59bbb0fb..9f5857e7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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. diff --git a/src/dusk/CMakeLists.txt b/src/dusk/CMakeLists.txt index 228f966b..743dbaa7 100644 --- a/src/dusk/CMakeLists.txt +++ b/src/dusk/CMakeLists.txt @@ -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) diff --git a/src/dusk/engine/engine.c b/src/dusk/engine/engine.c index d7a6e3f4..937b3f66 100644 --- a/src/dusk/engine/engine.c +++ b/src/dusk/engine/engine.c @@ -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 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2b972094..e63b0cfc 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -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)