From 5dc45a75a65e607e634c97f6d624e6799d049903 Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Mon, 18 May 2026 12:53:04 -0400 Subject: [PATCH] Build now has lel-guecs in it so I can do a UI. --- Makefile | 4 ++-- meson.build | 25 ++++++++++++++++++------- src/meson.build | 6 ++++++ wraps/lel-guecs.wrap | 9 +++++++++ wraps/utf8cpp.wrap | 9 +++++++++ 5 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 src/meson.build create mode 100644 wraps/lel-guecs.wrap create mode 100644 wraps/utf8cpp.wrap diff --git a/Makefile b/Makefile index ceebef9..f0e3ce0 100644 --- a/Makefile +++ b/Makefile @@ -15,13 +15,13 @@ debug_build: meson compile -j 4 -C builddir run: build - ./builddir/b8rk.exe 1 1 ./roms/tetris.ch8 + ./builddir/b8rk.exe 1 120 ./roms/tetris.ch8 debug: build gdb --nx -x .gdbinit --ex run --args builddir/runtests.exe debug_run: build - gdb --nx -x .gdbinit --batch --ex run --ex bt --ex q --args builddir/b8rk.exe 1 1 ./roms/tetris.ch8 + gdb --nx -x .gdbinit --batch --ex run --ex bt --ex q --args builddir/b8rk.exe 1 120 ./roms/tetris.ch8 clean: meson compile --clean -C builddir diff --git a/meson.build b/meson.build index b4e4114..f5943cb 100644 --- a/meson.build +++ b/meson.build @@ -71,23 +71,34 @@ 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') +lel_guecs = subproject('lel-guecs').get_variable('lel_guecs_dep') dependencies += [ fmt, freetype2, flac, ogg, vorbis, vorbisfile, vorbisenc, sfml_audio, sfml_graphics, sfml_network, sfml_system, - sfml_window + sfml_window, lel_guecs ] -sources = [ - 'src/dbc.cpp', - 'src/chip8.cpp', - 'src/stats.cpp', -] +inc_dirs = include_directories('src') +subdir('src') # creates a sources var + +b8rk_lib = static_library('b8rk', + sources, + cpp_args: cpp_args, + include_directories: inc_dirs, + override_options: exe_defaults, + dependencies: dependencies) + +b8rk_dep = declare_dependency( + link_with: b8rk_lib, + include_directories: inc_dirs) + +dependencies += [b8rk_dep] executable('b8rk', - sources + [ 'src/main.cpp' ], + [ 'src/main.cpp' ], cpp_args: cpp_args, link_args: link_args, override_options: exe_defaults, diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000..acdd7f0 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,6 @@ + +sources = files( + 'dbc.cpp', + 'chip8.cpp', + 'stats.cpp', +) diff --git a/wraps/lel-guecs.wrap b/wraps/lel-guecs.wrap new file mode 100644 index 0000000..979cc68 --- /dev/null +++ b/wraps/lel-guecs.wrap @@ -0,0 +1,9 @@ +[wrap-git] +directory=lel-guecs-0.7.3 +url=https://git.zedshaw.games/games/lel-guecs.git +revision=HEAD +depth=1 +method=meson + +[provide] +lel_guecs = lel_guecs_dep diff --git a/wraps/utf8cpp.wrap b/wraps/utf8cpp.wrap new file mode 100644 index 0000000..c1ae900 --- /dev/null +++ b/wraps/utf8cpp.wrap @@ -0,0 +1,9 @@ +[wrap-git] +directory=utf8cpp-4.0.9 +url=https://github.com/nemtrif/utfcpp.git +revision=v4.0.9 +depth=1 +method=cmake + +[provide] +utf8cpp = utf8cpp_dep