From fe762b53a99cef74498d52d649a2677fb3a5dee8 Mon Sep 17 00:00:00 2001 From: Paul I Date: Sat, 6 Apr 2019 11:54:33 +0300 Subject: [PATCH] Meson: remove workaround for qtmain lib (#1430) --- src/meson.build | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/meson.build b/src/meson.build index 6a1f8155..8f503451 100644 --- a/src/meson.build +++ b/src/meson.build @@ -57,7 +57,7 @@ endif r2 = subproject('radare2') libr2_dep = r2.get_variable('libr2_dep') -qt5dep = dependency('qt5', modules: qt_modules) +qt5dep = dependency('qt5', modules: qt_modules, main: true) deps = [libr2_dep, qt5dep] if get_option('enable_python') @@ -98,17 +98,9 @@ moc_files = qt5_mod.preprocess( cpp = meson.get_compiler('cpp') -platform_inc = [] if host_machine.system() == 'windows' add_project_arguments('-D_CRT_NONSTDC_NO_DEPRECATE', language: 'cpp') add_project_arguments('-D_CRT_SECURE_NO_WARNINGS', language: 'cpp') - qt_host_libs = run_command('qmake', '-query', 'QT_HOST_LIBS').stdout().strip() - if get_option('buildtype').startswith('debug') - qtmain_libname = 'qtmaind.lib' - else - qtmain_libname = 'qtmain.lib' - endif - add_project_link_arguments(join_paths(qt_host_libs, qtmain_libname), language: 'cpp') endif cutter_exe = executable( @@ -116,6 +108,9 @@ cutter_exe = executable( moc_files, gui_app: true, sources: sources, - include_directories: [include_directories('core', 'common', 'widgets', 'plugins'), platform_inc, conf_inc], + include_directories: [ + include_directories('core', 'common', 'widgets', 'plugins'), + conf_inc + ], dependencies: deps, )