Skip to content
Extraits de code Groupes Projets
Valider fba8529d rédigé par Ryan Lucia's avatar Ryan Lucia
Parcourir les fichiers

meson: remove old wx_path and icu_path hacks

parent 34ae282d
Branches
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -107,20 +107,15 @@ wx_dep = dependency('wxWidgets', version: '>=3.0.0', ...@@ -107,20 +107,15 @@ 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
if get_option('wx_path') != ''
deps_inc += include_directories(get_option('wx_path') / 'include' / 'msvc', get_option('wx_path') / 'include')
add_project_arguments('-DUNICODE', '-D_UNICODE', language: 'cpp')
add_project_arguments('-DwxMSVC_VERSION_AUTO', '-DWXUSINGDLL', language: 'cpp')
else else
buildShared = 'ON' build_shared = 'ON'
if get_option('default_library') == 'static' if get_option('default_library') == 'static'
buildShared = 'OFF' build_shared = 'OFF'
endif endif
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(buildShared), '-DwxBUILD_SHARED=@0@'.format(build_shared),
'-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'),
...@@ -144,7 +139,6 @@ else # this will only be hit with msvc ...@@ -144,7 +139,6 @@ else # this will only be hit with msvc
endif endif
endif endif
endif endif
endif
deps += dependency('icu-uc', version: '>=4.8.1.1') deps += dependency('icu-uc', version: '>=4.8.1.1')
deps += dependency('icu-i18n', version: '>=4.8.1.1') deps += dependency('icu-i18n', version: '>=4.8.1.1')
......
...@@ -14,9 +14,6 @@ option('uchardet', type: 'feature', description: 'uchardet character encoding de ...@@ -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')
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter