Meson build now attempts to force local only build and linkage.
This commit is contained in:
parent
57e8774fad
commit
c51d46aeb8
2 changed files with 14 additions and 14 deletions
27
meson.build
27
meson.build
|
@ -53,22 +53,21 @@ elif build_machine.system() == 'darwin'
|
||||||
]
|
]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
catch2 = dependency('catch2-with-main')
|
catch2 = subproject('catch2').get_variable('catch2_with_main_dep')
|
||||||
fmt = subproject('fmt').get_variable('fmt_dep')
|
fmt = subproject('fmt').get_variable('fmt_dep')
|
||||||
json = dependency('nlohmann_json')
|
json = subproject('nlohmann_json').get_variable('nlohmann_json_dep')
|
||||||
freetype2 = dependency('freetype2')
|
freetype2 = subproject('freetype2').get_variable('freetype_dep')
|
||||||
|
|
||||||
flac = dependency('flac')
|
flac = subproject('flac').get_variable('flac_dep')
|
||||||
ogg = dependency('ogg')
|
ogg = subproject('ogg').get_variable('libogg_dep')
|
||||||
vorbis = dependency('vorbis')
|
vorbis = subproject('vorbis').get_variable('vorbis_dep')
|
||||||
vorbisfile = dependency('vorbisfile')
|
vorbisfile = subproject('vorbis').get_variable('vorbisfile_dep')
|
||||||
vorbisenc = dependency('vorbisenc')
|
vorbisenc = subproject('vorbis').get_variable('vorbisenc_dep')
|
||||||
sfml_audio = dependency('sfml_audio')
|
sfml_audio = subproject('sfml').get_variable('sfml_audio_dep')
|
||||||
sfml_graphics = dependency('sfml_graphics')
|
sfml_graphics = subproject('sfml').get_variable('sfml_graphics_dep')
|
||||||
sfml_network = dependency('sfml_network')
|
sfml_network = subproject('sfml').get_variable('sfml_network_dep')
|
||||||
sfml_system = dependency('sfml_system')
|
sfml_system = subproject('sfml').get_variable('sfml_system_dep')
|
||||||
sfml_window = dependency('sfml_window',
|
sfml_window = subproject('sfml').get_variable('sfml_window_dep')
|
||||||
default_options: ['default_library=shared'])
|
|
||||||
|
|
||||||
dependencies += [
|
dependencies += [
|
||||||
fmt, json, freetype2,
|
fmt, json, freetype2,
|
||||||
|
|
|
@ -72,6 +72,7 @@ namespace textures {
|
||||||
sf::Image texture;
|
sf::Image texture;
|
||||||
bool good = texture.loadFromFile(filename);
|
bool good = texture.loadFromFile(filename);
|
||||||
dbc::check(good, fmt::format("failed to load {}", filename));
|
dbc::check(good, fmt::format("failed to load {}", filename));
|
||||||
|
fmt::println("texture size={}", sizeof(texture));
|
||||||
return texture;
|
return texture;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue