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

Take some suggestions from the meson IRC channel: don't set unnecessary variables before project(); don't disallow plain builds since the options that meson doesn't apply aren't any of the ones I care about.

This commit is contained in:
Pietro Gagliardi 2019-03-22 22:00:19 -04:00
parent 1a9b0881bc
commit 7063ed6e32
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -11,11 +11,8 @@
# I'd also like to be able to omit the library's dependency libraries in the executables if building a shared library, as those are not required in that case; I'd need to require them in a static library. # I'd also like to be able to omit the library's dependency libraries in the executables if building a shared library, as those are not required in that case; I'd need to require them in a static library.
# And for Windows, the shared library (but not shared executables) needs an additional resource file, and the static executables (but not the static library) need a *different* resource file. (Windows static libraries can't contain resources anyway; the linkers will just ignore the resource objects.) # And for Windows, the shared library (but not shared executables) needs an additional resource file, and the static executables (but not the static library) need a *different* resource file. (Windows static libraries can't contain resources anyway; the linkers will just ignore the resource objects.)
libui_OS = target_machine.system()
libui_MSVC = meson.get_compiler('c').get_id() == 'msvc'
libui_default_options = [ libui_default_options = [
'buildtype=debug', # build debug by default (TODO: disallow plain?) 'buildtype=debug', # build debug by default
'default_library=shared', # build shared libraries by default 'default_library=shared', # build shared libraries by default
] ]
# TODO switch to tabs; the spaces are just so I can share this file while I'm writing it # TODO switch to tabs; the spaces are just so I can share this file while I'm writing it
@ -45,6 +42,9 @@ foreach name, value : libui_forced_options
endif endif
endforeach endforeach
libui_OS = target_machine.system()
libui_MSVC = meson.get_compiler('c').get_id() == 'msvc'
libui_mode = get_option('default_library') libui_mode = get_option('default_library')
if libui_mode == 'both' if libui_mode == 'both'
error('sorry, but libui does not support building both shared and static libraries at the same time, because Windows resource file rules differ between the two') error('sorry, but libui does not support building both shared and static libraries at the same time, because Windows resource file rules differ between the two')