From 194255bffe98eca10a35badf883e0c825b799b6f Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Tue, 28 Apr 2026 14:02:59 -0500 Subject: [PATCH] Fix merge conflcits --- src/dusk/CMakeLists.txt | 5 ----- src/dusk/engine/engine.c | 17 ----------------- 2 files changed, 22 deletions(-) diff --git a/src/dusk/CMakeLists.txt b/src/dusk/CMakeLists.txt index 53fb4bab..381af864 100644 --- a/src/dusk/CMakeLists.txt +++ b/src/dusk/CMakeLists.txt @@ -32,11 +32,6 @@ if(NOT yyjson_FOUND) endif() endif() -if(NOT jerryscript_FOUND) - find_package(jerryscript REQUIRED) - target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC jerryscript) -endif() - if(NOT jerryscript_FOUND) find_package(jerryscript REQUIRED) target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PRIVATE diff --git a/src/dusk/engine/engine.c b/src/dusk/engine/engine.c index a69e045d..ec613520 100644 --- a/src/dusk/engine/engine.c +++ b/src/dusk/engine/engine.c @@ -60,23 +60,6 @@ errorret_t engineInit(const int32_t argc, const char_t **argv) { errorChain(networkInit()); errorChain(gameInit()); - // - jerry_init(JERRY_INIT_EMPTY); - const jerry_char_t script[] = "1 + 1"; - jerry_value_t result = jerry_eval( - script, - sizeof(script) - 1, - JERRY_PARSE_NO_OPTS - ); - if(jerry_value_is_exception(result)) { - consolePrint("Script error\n"); - } else { - double num = jerry_value_as_number(result); - consolePrint("Result: %f\n", num); - } - jerry_value_free(result); - jerry_cleanup(); - /* Run the init script. */ consolePrint("Engine initialized"); errorChain(scriptContextExecFile(&SCRIPT_MANAGER.mainContext, "init.js", NULL));