iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

meson: add missing link dependencies on windows

This commit is contained in:
line0 2020-04-12 21:51:28 +02:00
parent c4b8b351f1
commit 1dcfbbd194
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
meson.build
View File

@ -89,9 +89,9 @@ else # this will only be hit with msvc
endif endif
wx = cmake.subproject('wxWidgets', cmake_options: ['-DwxBUILD_INSTALL=OFF', wx = cmake.subproject('wxWidgets', cmake_options: ['-DwxBUILD_INSTALL=OFF',
'-DwxBUILD_PRECOMP=OFF', # breaks project generation w/ meson '-DwxBUILD_PRECOMP=OFF', # otherwise breaks project generation w/ meson
'-DwxBUILD_SHARED=@0@'.format(buildShared), '-DwxBUILD_SHARED=@0@'.format(buildShared),
'-DwxBUILD_MONOLITHIC=ON']) '-DwxBUILD_MONOLITHIC=ON']) # otherwise breaks project generation w/ meson
deps += [ deps += [
wx.dependency('mono'), wx.dependency('mono'),
wx.dependency('wxzlib'), wx.dependency('wxzlib'),
@ -99,6 +99,19 @@ else # this will only be hit with msvc
wx.dependency('wxexpat'), wx.dependency('wxexpat'),
wx.dependency('wxscintilla') 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
@ -155,8 +168,10 @@ if host_machine.system() == 'windows' and not get_option('directsound').disabled
if not have_dsound_h and get_option('directsound').enabled() if not have_dsound_h and get_option('directsound').enabled()
error('DirectSound enabled but dsound.h not found') error('DirectSound enabled but dsound.h not found')
endif endif
if dsound_dep.found() and winmm_dep.found() and ole32_dep.found() and have_dsound_h
deps += [dsound_dep, winmm_dep, ole32_dep] dxguid_dep = cc.find_library('dxguid', required: true)
if dsound_dep.found() and winmm_dep.found() and ole32_dep.found() and dxguid_dep.found() and have_dsound_h
deps += [dsound_dep, winmm_dep, ole32_dep, dxguid_dep]
conf.set('WITH_DIRECTSOUND', '1') conf.set('WITH_DIRECTSOUND', '1')
dep_avail += 'DirectSound' dep_avail += 'DirectSound'
endif endif

14
src/meson.build
View File

@ -171,6 +171,20 @@ if host_machine.system() == 'darwin'
'osx/retina_helper.mm', 'osx/retina_helper.mm',
'osx/scintilla_ime.mm', 'osx/scintilla_ime.mm',
] ]
elif host_machine.system() == 'windows'
aegisub_src += [
'font_file_lister_gdi.cpp'
]
if cc.has_header('wingdi.h')
deps += cc.find_library('gdi32', required: true)
else
error('Missing Windows SDK GDI Library (wingdi.h / gdi32.lib)')
endif
if cc.has_header('usp10.h')
deps += cc.find_library('usp10', required: true)
else
error('Missing Windows SDK Uniscribe Library (usp10.h / usp10.lib)')
endif
elif conf.get('WITH_FONTCONFIG') == '1' elif conf.get('WITH_FONTCONFIG') == '1'
aegisub_src += 'font_file_lister_fontconfig.cpp' aegisub_src += 'font_file_lister_fontconfig.cpp'
endif endif