Skip to content
Extraits de code Groupes Projets
Valider 805b0172 rédigé par Myaamori's avatar Myaamori Validation de odrling
Parcourir les fichiers

meson: fix wx subproject on Linux

parent d32154c4
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -144,17 +144,21 @@ else ...@@ -144,17 +144,21 @@ else
wx = cmake.subproject('wxWidgets', cmake_options: ['-DwxBUILD_INSTALL=OFF', wx = cmake.subproject('wxWidgets', cmake_options: ['-DwxBUILD_INSTALL=OFF',
'-DwxBUILD_PRECOMP=OFF', # otherwise breaks project generation w/ meson '-DwxBUILD_PRECOMP=OFF', # otherwise breaks project generation w/ meson
'-DwxBUILD_SHARED=@0@'.format(build_shared), '-DwxBUILD_SHARED=@0@'.format(build_shared),
'-DwxUSE_WEBVIEW=OFF', # breaks build on linux
'-DwxBUILD_MONOLITHIC=ON']) # otherwise breaks project generation w/ meson '-DwxBUILD_MONOLITHIC=ON']) # otherwise breaks project generation w/ meson
deps += [ deps += [
wx.dependency('wxmono'), wx.dependency('wxmono'),
wx.dependency('wxzlib'),
wx.dependency('wxpng'),
wx.dependency('wxexpat'),
wx.dependency('wxregex'), wx.dependency('wxregex'),
wx.dependency('wxscintilla') wx.dependency('wxscintilla')
] ]
if host_machine.system() == 'windows' if host_machine.system() == 'windows'
deps += [
wx.dependency('wxzlib'),
wx.dependency('wxpng'),
wx.dependency('wxexpat')
]
if cc.has_header('rpc.h') if cc.has_header('rpc.h')
deps += cc.find_library('rpcrt4', required: true) deps += cc.find_library('rpcrt4', required: true)
else else
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter