forked from mia/Aegisub
meson: remove old wx_path and icu_path hacks
This commit is contained in:
parent
e393509515
commit
7d0028799f
62
meson.build
62
meson.build
|
@ -107,41 +107,35 @@ wx_dep = dependency('wxWidgets', version: '>=3.0.0',
|
||||||
|
|
||||||
if wx_dep.found()
|
if wx_dep.found()
|
||||||
deps += wx_dep
|
deps += wx_dep
|
||||||
else # this will only be hit with msvc
|
else
|
||||||
if get_option('wx_path') != ''
|
build_shared = 'ON'
|
||||||
deps_inc += include_directories(get_option('wx_path') / 'include' / 'msvc', get_option('wx_path') / 'include')
|
if get_option('default_library') == 'static'
|
||||||
add_project_arguments('-DUNICODE', '-D_UNICODE', language: 'cpp')
|
build_shared = 'OFF'
|
||||||
add_project_arguments('-DwxMSVC_VERSION_AUTO', '-DWXUSINGDLL', language: 'cpp')
|
endif
|
||||||
else
|
|
||||||
buildShared = 'ON'
|
wx = cmake.subproject('wxWidgets', cmake_options: ['-DwxBUILD_INSTALL=OFF',
|
||||||
if get_option('default_library') == 'static'
|
'-DwxBUILD_PRECOMP=OFF', # otherwise breaks project generation w/ meson
|
||||||
buildShared = 'OFF'
|
'-DwxBUILD_SHARED=@0@'.format(build_shared),
|
||||||
|
'-DwxBUILD_MONOLITHIC=ON']) # otherwise breaks project generation w/ meson
|
||||||
|
deps += [
|
||||||
|
wx.dependency('wxmono'),
|
||||||
|
wx.dependency('wxzlib'),
|
||||||
|
wx.dependency('wxpng'),
|
||||||
|
wx.dependency('wxexpat'),
|
||||||
|
wx.dependency('wxregex'),
|
||||||
|
wx.dependency('wxscintilla')
|
||||||
|
]
|
||||||
|
|
||||||
|
if host_machine.system() == 'windows'
|
||||||
|
if cc.has_header('rpc.h')
|
||||||
|
deps += cc.find_library('rpcrt4', required: true)
|
||||||
|
else
|
||||||
|
error('Missing Windows SDK RPC Library (rpc.h / rpcrt4.lib)')
|
||||||
endif
|
endif
|
||||||
|
if cc.has_header('commctrl.h')
|
||||||
wx = cmake.subproject('wxWidgets', cmake_options: ['-DwxBUILD_INSTALL=OFF',
|
deps += cc.find_library('comctl32', required: true)
|
||||||
'-DwxBUILD_PRECOMP=OFF', # otherwise breaks project generation w/ meson
|
else
|
||||||
'-DwxBUILD_SHARED=@0@'.format(buildShared),
|
error('Missing Windows SDK Common Controls Library (commctrl.h / comctl32.lib)')
|
||||||
'-DwxBUILD_MONOLITHIC=ON']) # otherwise breaks project generation w/ meson
|
|
||||||
deps += [
|
|
||||||
wx.dependency('wxmono'),
|
|
||||||
wx.dependency('wxzlib'),
|
|
||||||
wx.dependency('wxpng'),
|
|
||||||
wx.dependency('wxexpat'),
|
|
||||||
wx.dependency('wxregex'),
|
|
||||||
wx.dependency('wxscintilla')
|
|
||||||
]
|
|
||||||
|
|
||||||
if host_machine.system() == 'windows'
|
|
||||||
if cc.has_header('rpc.h')
|
|
||||||
deps += cc.find_library('rpcrt4', required: true)
|
|
||||||
else
|
|
||||||
error('Missing Windows SDK RPC Library (rpc.h / rpcrt4.lib)')
|
|
||||||
endif
|
|
||||||
if cc.has_header('commctrl.h')
|
|
||||||
deps += cc.find_library('comctl32', required: true)
|
|
||||||
else
|
|
||||||
error('Missing Windows SDK Common Controls Library (commctrl.h / comctl32.lib)')
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -14,9 +14,6 @@ option('uchardet', type: 'feature', description: 'uchardet character encoding de
|
||||||
option('system_luajit', type: 'boolean', value: false, description: 'Force using system luajit')
|
option('system_luajit', type: 'boolean', value: false, description: 'Force using system luajit')
|
||||||
option('local_boost', type: 'boolean', value: false, description: 'Force using locally compiled Boost')
|
option('local_boost', type: 'boolean', value: false, description: 'Force using locally compiled Boost')
|
||||||
|
|
||||||
option('icu_path', type: 'string', value: '', description: 'Path to ICU libraries on Windows')
|
|
||||||
option('wx_path', type: 'string', value: '', description: 'Path to wxWidgets libraries on Windows')
|
|
||||||
|
|
||||||
option('credit', type: 'string', value: '', description: 'Build credit shown in program title')
|
option('credit', type: 'string', value: '', description: 'Build credit shown in program title')
|
||||||
|
|
||||||
option('enable_update_checker', type: 'boolean', value: false, description: 'Enable the update checker')
|
option('enable_update_checker', type: 'boolean', value: false, description: 'Enable the update checker')
|
||||||
|
|
Loading…
Reference in New Issue