diff --git a/CMakeLists.txt b/CMakeLists.txt index e25a968a..5273c3cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,10 +197,6 @@ if(NOT EMSCRIPTEN) ) endif() -if(EMSCRIPTEN) - list(APPEND XEUS_CPP_SRC src/xinterpreter_wasm.cpp) -endif() - set(XEUS_CPP_MAIN_SRC src/main.cpp ) diff --git a/include/xeus-cpp/xinterpreter_wasm.hpp b/include/xeus-cpp/xinterpreter_wasm.hpp deleted file mode 100644 index 8b1d54c5..00000000 --- a/include/xeus-cpp/xinterpreter_wasm.hpp +++ /dev/null @@ -1,28 +0,0 @@ -/************************************************************************************ - * Copyright (c) 2023, xeus-cpp contributors * - * Copyright (c) 2023, Johan Mabille, Loic Gouarin, Sylvain Corlay, Wolf Vollprecht * - * * - * Distributed under the terms of the BSD 3-Clause License. * - * * - * The full license is in the file LICENSE, distributed with this software. * - ************************************************************************************/ - -#ifndef XEUS_CPP_INTERPRETER_WASM_HPP -#define XEUS_CPP_INTERPRETER_WASM_HPP - -#include "xinterpreter.hpp" -#include "xeus_cpp_config.hpp" - -namespace xcpp -{ - class XEUS_CPP_API wasm_interpreter : public interpreter - { - public: - - wasm_interpreter(int argc = 0, char** argv = nullptr); - virtual ~wasm_interpreter() = default; - - }; -} - -#endif diff --git a/src/main_emscripten_kernel.cpp b/src/main_emscripten_kernel.cpp index 555b596a..ae638793 100644 --- a/src/main_emscripten_kernel.cpp +++ b/src/main_emscripten_kernel.cpp @@ -13,7 +13,7 @@ #include -#include "xeus-cpp/xinterpreter_wasm.hpp" +#include "xeus-cpp/xinterpreter.hpp" template static interpreter_type* builder_with_args(emscripten::val js_args) @@ -39,6 +39,6 @@ static interpreter_type* builder_with_args(emscripten::val js_args) EMSCRIPTEN_BINDINGS(my_module) { xeus::export_core(); - using interpreter_type = xcpp::wasm_interpreter; + using interpreter_type = xcpp::interpreter; xeus::export_kernel>("xkernel"); } diff --git a/src/xinterpreter_wasm.cpp b/src/xinterpreter_wasm.cpp deleted file mode 100644 index 9e65bdb9..00000000 --- a/src/xinterpreter_wasm.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/************************************************************************************ - * Copyright (c) 2023, xeus-cpp contributors * - * Copyright (c) 2023, Martin Vassilev * - * * - * Distributed under the terms of the BSD 3-Clause License. * - * * - * The full license is in the file LICENSE, distributed with this software. * - ************************************************************************************/ - -#include "xeus/xinterpreter.hpp" -#include "xeus/xsystem.hpp" - -#include "xeus-cpp/xinterpreter.hpp" -#include "xeus-cpp/xinterpreter_wasm.hpp" - -namespace xcpp -{ - wasm_interpreter::wasm_interpreter(int argc, char** argv) - : interpreter(argc, argv) - { - } -}