From c51d46aeb83a40586d6e84c9a7f94e3c80e8da81 Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Fri, 25 Apr 2025 00:55:58 -0400
Subject: [PATCH] Meson build now attempts to force local only build and
 linkage.

---
 meson.build  | 29 ++++++++++++++---------------
 textures.cpp |  1 +
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/meson.build b/meson.build
index 38b26e5..e0b34a1 100644
--- a/meson.build
+++ b/meson.build
@@ -53,22 +53,21 @@ elif build_machine.system() == 'darwin'
   ]
 endif
 
-catch2 = dependency('catch2-with-main')
+catch2 = subproject('catch2').get_variable('catch2_with_main_dep')
 fmt = subproject('fmt').get_variable('fmt_dep')
-json = dependency('nlohmann_json')
-freetype2 = dependency('freetype2')
-
-flac = dependency('flac')
-ogg = dependency('ogg')
-vorbis = dependency('vorbis')
-vorbisfile = dependency('vorbisfile')
-vorbisenc = dependency('vorbisenc')
-sfml_audio = dependency('sfml_audio')
-sfml_graphics = dependency('sfml_graphics')
-sfml_network = dependency('sfml_network')
-sfml_system = dependency('sfml_system')
-sfml_window = dependency('sfml_window',
-  default_options: ['default_library=shared'])
+json = subproject('nlohmann_json').get_variable('nlohmann_json_dep')
+freetype2 = subproject('freetype2').get_variable('freetype_dep')
+
+flac = subproject('flac').get_variable('flac_dep')
+ogg = subproject('ogg').get_variable('libogg_dep')
+vorbis = subproject('vorbis').get_variable('vorbis_dep')
+vorbisfile = subproject('vorbis').get_variable('vorbisfile_dep')
+vorbisenc = subproject('vorbis').get_variable('vorbisenc_dep')
+sfml_audio = subproject('sfml').get_variable('sfml_audio_dep')
+sfml_graphics = subproject('sfml').get_variable('sfml_graphics_dep')
+sfml_network = subproject('sfml').get_variable('sfml_network_dep')
+sfml_system = subproject('sfml').get_variable('sfml_system_dep')
+sfml_window = subproject('sfml').get_variable('sfml_window_dep')
 
 dependencies += [
   fmt, json, freetype2,
diff --git a/textures.cpp b/textures.cpp
index 1d51518..4fc7bdb 100644
--- a/textures.cpp
+++ b/textures.cpp
@@ -72,6 +72,7 @@ namespace textures {
     sf::Image texture;
     bool good = texture.loadFromFile(filename);
     dbc::check(good, fmt::format("failed to load {}", filename));
+    fmt::println("texture size={}", sizeof(texture));
     return texture;
   }