YourWishes/dusk
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix merge conflcits

Browse Source
This commit is contained in:
Dominic Masters
2026-04-28 14:02:59 -05:00
parent 52ee627079
commit 194255bffe
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dusk/CMakeLists.txt
-5
View File
@@ -32,11 +32,6 @@ if(NOT yyjson_FOUND)
endif() endif()
endif() endif()
if(NOT jerryscript_FOUND)
find_package(jerryscript REQUIRED)
target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC jerryscript)
endif()
if(NOT jerryscript_FOUND) if(NOT jerryscript_FOUND)
find_package(jerryscript REQUIRED) find_package(jerryscript REQUIRED)
target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PRIVATE target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PRIVATE
src/dusk/engine/engine.c
-17
View File
@@ -60,23 +60,6 @@ errorret_t engineInit(const int32_t argc, const char_t **argv) {
errorChain(networkInit()); errorChain(networkInit());
errorChain(gameInit()); 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. */ /* Run the init script. */
consolePrint("Engine initialized"); consolePrint("Engine initialized");
errorChain(scriptContextExecFile(&SCRIPT_MANAGER.mainContext, "init.js", NULL)); errorChain(scriptContextExecFile(&SCRIPT_MANAGER.mainContext, "init.js", NULL));