meson cleanup

- host_machine seems to be what we want for the machine that the binary
  will run on. Doesn't matter unless anyone's cross compiling.

- There's a magic cross-platform threads dep apparently.
This commit is contained in:
Jōshin 2019-01-02 10:34:11 -08:00
parent c3fe60db4a
commit b223cd8799
4 changed files with 8 additions and 15 deletions

View File

@ -242,22 +242,16 @@ conf_data.set('U3_MEMORY_DEBUG', get_option('gc'))
conf_data.set('U3_CPU_DEBUG', get_option('prof'))
conf_data.set('U3_EVENT_TIME_DEBUG', get_option('event-time'))
osdet = build_machine.system()
osdet = host_machine.system()
os_c_flags = ['-funsigned-char','-ffast-math']
os_deps = []
os_deps = [dependency('threads')]
os_link_flags = []
if osdet == 'linux'
conf_data.set('U3_OS_linux', true)
if(legacy_meson)
pthread_dep = find_library('pthread')
else
pthread_dep = meson.get_compiler('c').find_library('pthread')
endif
ncurses_dep = dependency('ncurses')
os_deps = os_deps + [pthread_dep, ncurses_dep]
os_deps = os_deps + [ncurses_dep]
elif osdet == 'darwin'
conf_data.set('U3_OS_osx', true)
@ -275,10 +269,9 @@ elif osdet == 'darwin'
elif osdet == 'bsd' or osdet == 'freebsd'
conf_data.set('U3_OS_bsd', true)
pthread_dep = meson.get_compiler('c').find_library('pthread')
kvm_dep = meson.get_compiler('c').find_library('kvm')
ncurses_dep = dependency('ncurses')
os_deps = os_deps + [kvm_dep, pthread_dep, ncurses_dep]
os_deps = os_deps + [kvm_dep, ncurses_dep]
elif osdet == 'openbsd'
conf_data.set('U3_OS_bsd', true)
@ -290,7 +283,7 @@ else
error('Unsupported OS detected:' + osdet)
endif
endian = build_machine.endian()
endian = host_machine.endian()
if endian == 'little'
conf_data.set('U3_OS_ENDIAN_little', true)

@ -1 +1 @@
Subproject commit 3b1f53c86b71f6fdc099b3b378de6f379b4b8412
Subproject commit 0ed9ac70757a16ec45f91b8a347850d9699c3fb1

@ -1 +1 @@
Subproject commit 0c3a346a60f0b3bb42445b2c63198a6e0f94c89b
Subproject commit 6429495dc9a80aaf1c243038b381451f12bc7dcf

@ -1 +1 @@
Subproject commit 87f73ffad3d3047baf1ed134fb7827a9dca163ee
Subproject commit b4e87986511e01ea6477838dc686cc7c08c3c8c9