50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
--- a/linux-user/main.c
|
|
+++ b/linux-user/main.c
|
|
@@ -671,7 +671,8 @@
|
|
return optind;
|
|
}
|
|
|
|
-int main(int argc, char **argv, char **envp)
|
|
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
|
|
+int qemu_main(int argc, char **argv, char **envp)
|
|
{
|
|
struct target_pt_regs regs1, *regs = ®s1;
|
|
struct image_info info1, *info = &info1;
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -1,6 +1,6 @@
|
|
project('qemu', ['c'], meson_version: '>=1.5.0',
|
|
default_options: ['warning_level=1', 'c_std=gnu11', 'cpp_std=gnu++11', 'b_colorout=auto',
|
|
- 'b_staticpic=false', 'stdsplit=false', 'optimization=2', 'b_pie=true'],
|
|
+ 'b_staticpic=true', 'stdsplit=false', 'optimization=2', 'b_pie=true'],
|
|
version: files('VERSION'))
|
|
|
|
meson.add_devenv({ 'MESON_BUILD_ROOT' : meson.project_build_root() })
|
|
@@ -4015,14 +4014,13 @@
|
|
exe_name += '-unsigned'
|
|
endif
|
|
|
|
- emulator = executable(exe_name, exe['sources'],
|
|
+ emulator = library(exe_name, exe['sources'],
|
|
install: true,
|
|
c_args: c_args,
|
|
dependencies: arch_deps + exe['dependencies'],
|
|
objects: lib.extract_all_objects(recursive: true),
|
|
link_depends: [block_syms, qemu_syms],
|
|
- link_args: link_args,
|
|
- win_subsystem: exe['win_subsystem'])
|
|
+ link_args: link_args)
|
|
|
|
if host_os == 'darwin'
|
|
icon = 'pc-bios/qemu.rsrc'
|
|
@@ -4166,9 +4164,7 @@
|
|
|
|
subdir('scripts')
|
|
subdir('tools')
|
|
-subdir('pc-bios')
|
|
subdir('docs')
|
|
-subdir('tests')
|
|
if gtk.found()
|
|
subdir('po')
|
|
endif
|