Did some work checking the build on OSX. Looks like clang 14 is too old, will try later version.
This commit is contained in:
parent
8d9c2d8c05
commit
2a4ada81bb
7 changed files with 75 additions and 58 deletions
23
meson.build
23
meson.build
|
@ -16,9 +16,7 @@ catch2 = dependency('catch2-with-main')
|
|||
fmt = dependency('fmt', allow_fallback: true)
|
||||
json = dependency('nlohmann_json')
|
||||
freetype2 = dependency('freetype2')
|
||||
opengl32 = cc.find_library('opengl32', required: true)
|
||||
winmm = cc.find_library('winmm', required: true)
|
||||
gdi32 = cc.find_library('gdi32', required: true)
|
||||
|
||||
flac = dependency('flac')
|
||||
ogg = dependency('ogg')
|
||||
vorbis = dependency('vorbis')
|
||||
|
@ -26,7 +24,6 @@ vorbisfile = dependency('vorbisfile')
|
|||
vorbisenc = dependency('vorbisenc')
|
||||
sfml_audio = dependency('sfml_audio')
|
||||
sfml_graphics = dependency('sfml_graphics')
|
||||
sfml_main = dependency('sfml_main')
|
||||
sfml_network = dependency('sfml_network')
|
||||
sfml_system = dependency('sfml_system')
|
||||
sfml_window = dependency('sfml_window')
|
||||
|
@ -35,13 +32,25 @@ ftxui_dom = dependency('ftxui-dom')
|
|||
ftxui_component = dependency('ftxui-component')
|
||||
|
||||
dependencies = [
|
||||
fmt, json, opengl32, freetype2,
|
||||
fmt, json, freetype2,
|
||||
flac, ogg, vorbis, vorbisfile, vorbisenc,
|
||||
winmm, gdi32, sfml_audio, sfml_graphics,
|
||||
sfml_main, sfml_network, sfml_system,
|
||||
sfml_audio, sfml_graphics,
|
||||
sfml_network, sfml_system,
|
||||
sfml_window, ftxui_screen, ftxui_dom, ftxui_component
|
||||
]
|
||||
|
||||
if build_machine.system() == 'windows'
|
||||
sfml_main = dependency('sfml_main')
|
||||
opengl32 = cc.find_library('opengl32', required: true)
|
||||
winmm = cc.find_library('winmm', required: true)
|
||||
gdi32 = cc.find_library('gdi32', required: true)
|
||||
|
||||
dependencies += [
|
||||
opengl32, winmm, gdi32, sfml_main
|
||||
]
|
||||
endif
|
||||
|
||||
|
||||
sources = [
|
||||
'animator.cpp',
|
||||
'ansi_parser.cpp',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue