beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-21 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Userland: Port wasm to LibMain

Browse source
This commit is contained in:
Federico Guerinoni 2022-01-08 18:41:38 +01:00 committed by Brian Gianforcaro
parent 05f0f70b00
commit 9aa556fdf0
Notes: sideshowbarker 2024-07-17 21:20:26 +09:00 
Author: https://github.com/guerinoni
Commit: https://github.com/SerenityOS/serenity/commit/9aa556fdf07
Pull-request: https://github.com/SerenityOS/serenity/pull/11736
Reviewed-by: https://github.com/bgianfo ✅
Reviewed-by: https://github.com/creator1creeper1 ✅
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Meta/Lagom/CMakeLists.txt
View file

@ -502,7 +502,7 @@ if (BUILD_LAGOM)
add_executable(wasm_lagom ../../Userland/Utilities/wasm.cpp)
set_target_properties(wasm_lagom PROPERTIES OUTPUT_NAME wasm)
target_link_libraries(wasm_lagom LagomCore LagomWasm LagomLine)
target_link_libraries(wasm_lagom LagomCore LagomWasm LagomLine LagomMain)
enable_testing()
# LibTest

2
Userland/Utilities/CMakeLists.txt
View file

@ -160,7 +160,7 @@ target_link_libraries(userdel LibMain)
target_link_libraries(usermod LibMain)
target_link_libraries(utmpupdate LibMain)
target_link_libraries(w LibMain)
target_link_libraries(wasm LibWasm LibLine)
target_link_libraries(wasm LibMain LibWasm LibLine)
target_link_libraries(watch LibMain)
target_link_libraries(wc LibMain)
target_link_libraries(which LibMain)

6
Userland/Utilities/wasm.cpp
View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2021, Ali Mohammad Pur <mpfard@serenityos.org>
* Copyright (c) 2022, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -8,6 +9,7 @@
#include <LibCore/File.h>
#include <LibCore/FileStream.h>
#include <LibLine/Editor.h>
#include <LibMain/Main.h>
#include <LibWasm/AbstractMachine/AbstractMachine.h>
#include <LibWasm/AbstractMachine/BytecodeInterpreter.h>
#include <LibWasm/Printer/Printer.h>
@ -265,7 +267,7 @@ static void print_link_error(Wasm::LinkError const& error)
warnln("Missing import '{}'", missing);
}
int main(int argc, char* argv[])
ErrorOr<int> serenity_main(Main::Arguments arguments)
{
char const* filename = nullptr;
bool print = false;
@ -313,7 +315,7 @@ int main(int argc, char* argv[])
return false;
},
});
parser.parse(argc, argv);
parser.parse(arguments);
if (shell_mode) {
debug = true;