diff --git a/.vimrc_proj b/.vimrc_proj index 2b745b4..1d04d48 100644 --- a/.vimrc_proj +++ b/.vimrc_proj @@ -1 +1 @@ -set makeprg=meson\ compile\ -C\ . +set makeprg=make\ -f\ ../Makefile\ build diff --git a/Makefile b/Makefile index c095294..664ff4e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ SAMPLE=./sample/01-a-good-first-program.md +ROOT_DIR=$(dir $(firstword $(MAKEFILE_LIST))) all: build @@ -12,8 +13,8 @@ endif %.cpp : %.rl ragel -o $@ $< -build: md_parser.cpp - meson compile -j 10 -C builddir +build: $(ROOT_DIR)/md_parser.cpp + meson compile -j 10 -C $(ROOT_DIR)/builddir release_build: meson --wipe builddir -Db_ndebug=true --buildtype release @@ -23,10 +24,6 @@ debug_build: meson setup --wipe builddir -Db_ndebug=true --buildtype debugoptimized meson compile -j 10 -C builddir -tracy_build: - meson setup --wipe builddir --buildtype debugoptimized -Dtracy_enable=true -Dtracy:on_demand=true - meson compile -j 10 -C builddir - run: build ifeq '$(OS)' 'Windows_NT' powershell "cp ./builddir/besos.exe ." diff --git a/assets/text.otf b/assets/text.otf index 3094772..fd4b7f7 100644 Binary files a/assets/text.otf and b/assets/text.otf differ diff --git a/constants.hpp b/constants.hpp index 7d4e114..563cd07 100644 --- a/constants.hpp +++ b/constants.hpp @@ -4,7 +4,7 @@ constexpr const int WINDOW_WIDTH=1920; constexpr const int WINDOW_HEIGHT=1080; constexpr const int FRAME_LIMIT=60; constexpr const bool VSYNC=true; -constexpr const int TITLE_SIZE=124; -constexpr const int CONTENT_SIZE=94; +constexpr const int TITLE_SIZE=74; +constexpr const int CONTENT_SIZE=64; constexpr const int CONTROL_WIDTH=1000; constexpr const int CONTROL_HEIGHT=1000; diff --git a/meson.build b/meson.build index afedb20..ffca859 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ # clang might need _LIBCPP_ENABLE_CXX26_REMOVED_CODECVT -project('lel-sfml-starter', 'cpp', +project('bezos-loves-slides', 'cpp', version: '0.1.0', default_options: [ 'cpp_std=c++20', @@ -90,7 +90,7 @@ tests = [ 'tests/parsing.cpp' ] -executable('besos', sources + ['main.cpp'], +executable('bezos', sources + ['main.cpp'], cpp_args: cpp_args, link_args: link_args, override_options: exe_defaults, diff --git a/slides_ui.cpp b/slides_ui.cpp index 6726500..7f58fbd 100644 --- a/slides_ui.cpp +++ b/slides_ui.cpp @@ -27,7 +27,7 @@ void Slide::init(lel::Cell& cell) { $gui.layout( "[=*%(300,200)title|_|_]" "[_|_|_]" - "[=*%(300,300)content|_|_]" + "[=*%(300,400)content|_|_]" "[_|_|_]" "[_|_|_]"); @@ -58,7 +58,7 @@ SlidesUI::SlidesUI(shared_ptr deck) { $gui.position(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT); $gui.layout( "[t_left|t_center|t_right]" - "[m_left|*%(300,400)slide|_|_|m_right]" + "[*%(300,400)slide|_|_|m_right|_]" "[_|_|_|_|_]" "[_|_|_|_|_]" "[_|_|_|_|_]"