interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up add_project_arguments()/add_project_link_arguments() invocations.

This commit is contained in:
Pietro Gagliardi 2019-03-26 21:53:00 -04:00
parent 0d9cfa0f68
commit fec83e72bf
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
meson.build
View File

@ -67,14 +67,14 @@ endif
libui_is_debug = get_option('buildtype').startswith('debug') libui_is_debug = get_option('buildtype').startswith('debug')
libui_project_compile_args = []
libui_project_link_args = []
if libui_OS == 'darwin' if libui_OS == 'darwin'
# TODO see if there's a more direct way to set this # TODO see if there's a more direct way to set this
libui_macosx_version_min = '-mmacosx-version-min=10.8' libui_macosx_version_min = '-mmacosx-version-min=10.8'
add_project_arguments(libui_macosx_version_min, libui_project_compile_args += [libui_macosx_version_min]
# TODO WHY IS THIS NEEDED MESON libui_project_link_args += [libui_macosx_version_min]
language: ['c', 'cpp', 'objc'])
add_project_link_arguments(libui_macosx_version_min,
language: ['c', 'cpp', 'objc'])
endif endif
# TODO see if there's a more direct way to set any of these # TODO see if there's a more direct way to set any of these
@ -88,43 +88,46 @@ if libui_MSVC
# the RTC flags are only supplied in debug builds because they are only supposed to be used by debug builds (see "This is because run-time error checks are not valid in a release (optimized) build." in https://docs.microsoft.com/cpp/build/reference/rtc-run-time-error-checks) # the RTC flags are only supplied in debug builds because they are only supposed to be used by debug builds (see "This is because run-time error checks are not valid in a release (optimized) build." in https://docs.microsoft.com/cpp/build/reference/rtc-run-time-error-checks)
# /RTCc is not supplied because it's discouraged as of VS2015; see https://www.reddit.com/r/cpp/comments/46mhne/rtcc_rejects_conformant_code_with_visual_c_2015/d06auq5 # /RTCc is not supplied because it's discouraged as of VS2015; see https://www.reddit.com/r/cpp/comments/46mhne/rtcc_rejects_conformant_code_with_visual_c_2015/d06auq5
# TODO add these compiler flags (assuming meson doesn't provide an alternate method for these, which I know it does for EHsc): # TODO add these compiler flags (assuming meson doesn't provide an alternate method for these, which I know it does for EHsc):
add_project_arguments( libui_project_compile_args += [
'/wd4100', '/wd4100',
'/bigobj', '/bigobj',
language: ['c', 'cpp', 'objc']) ]
if libui_is_debug if libui_is_debug
add_project_arguments('/RTC1', '/RTCs', '/RTCu', libui_project_compile_args += ['/RTC1', '/RTCs', '/RTCu']
language: ['c', 'cpp', 'objc'])
endif endif
add_project_link_arguments( libui_project_link_args += [
'/LARGEADDRESSAWARE', '/LARGEADDRESSAWARE',
'/INCREMENTAL:NO', '/INCREMENTAL:NO',
'/MANIFEST:NO', '/MANIFEST:NO',
language: ['c', 'cpp', 'objc']) ]
else else
add_project_arguments( libui_project_compile_args += [
'-Wno-unused-parameter', '-Wno-unused-parameter',
'-Wno-switch', '-Wno-switch',
language: ['c', 'cpp', 'objc']) ]
if libui_OS == 'windows' if libui_OS == 'windows'
# don't require shipping the MinGW-w64 DLLs # don't require shipping the MinGW-w64 DLLs
add_project_link_arguments( libui_project_link_args += [
'-static', '-static',
'-static-libgcc', '-static-libgcc',
'-static-libstdc++', '-static-libstdc++',
language: ['c', 'cpp', 'objc']) ]
endif endif
endif endif
libui_manifest_args = [] libui_manifest_args = []
if libui_mode == 'static' if libui_mode == 'static'
add_project_arguments('-D_UI_STATIC', libui_project_compile_args += ['-D_UI_STATIC']
language: ['c', 'cpp', 'objc'])
libui_manifest_args = ['-D_UI_STATIC'] libui_manifest_args = ['-D_UI_STATIC']
endif endif
add_project_arguments(libui_project_compile_args,
language: ['c', 'cpp', 'objc'])
add_project_link_arguments(libui_project_link_args,
language: ['c', 'cpp', 'objc'])
libui_sources = [] libui_sources = []
libui_deps = [] libui_deps = []
libui_soversion = '' libui_soversion = ''