ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-21 04:16:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Meson: remove workaround for qtmain lib (#1430)

Browse Source
This commit is contained in:
Paul I 2019-04-06 11:54:33 +03:00 committed by Florian Märkl
parent df65f250e5
commit fe762b53a9
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/meson.build
View File

@ -57,7 +57,7 @@ endif
r2 = subproject('radare2') r2 = subproject('radare2')
libr2_dep = r2.get_variable('libr2_dep') 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] deps = [libr2_dep, qt5dep]
if get_option('enable_python') if get_option('enable_python')
@ -98,17 +98,9 @@ moc_files = qt5_mod.preprocess(
cpp = meson.get_compiler('cpp') cpp = meson.get_compiler('cpp')
platform_inc = []
if host_machine.system() == 'windows' if host_machine.system() == 'windows'
add_project_arguments('-D_CRT_NONSTDC_NO_DEPRECATE', language: 'cpp') add_project_arguments('-D_CRT_NONSTDC_NO_DEPRECATE', language: 'cpp')
add_project_arguments('-D_CRT_SECURE_NO_WARNINGS', 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 endif
cutter_exe = executable( cutter_exe = executable(
@ -116,6 +108,9 @@ cutter_exe = executable(
moc_files, moc_files,
gui_app: true, gui_app: true,
sources: sources, 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, dependencies: deps,
) )