Fix things up so I can finally get this working with the new code I have.

master
Zed A. Shaw 2 weeks ago
parent 8a24d18b6f
commit 548b6e79e8
  1. 2
      .vimrc_proj
  2. 9
      Makefile
  3. BIN
      assets/text.otf
  4. 4
      constants.hpp
  5. 4
      meson.build
  6. 4
      slides_ui.cpp

@ -1 +1 @@
set makeprg=meson\ compile\ -C\ . set makeprg=make\ -f\ ../Makefile\ build

@ -1,4 +1,5 @@
SAMPLE=./sample/01-a-good-first-program.md SAMPLE=./sample/01-a-good-first-program.md
ROOT_DIR=$(dir $(firstword $(MAKEFILE_LIST)))
all: build all: build
@ -12,8 +13,8 @@ endif
%.cpp : %.rl %.cpp : %.rl
ragel -o $@ $< ragel -o $@ $<
build: md_parser.cpp build: $(ROOT_DIR)/md_parser.cpp
meson compile -j 10 -C builddir meson compile -j 10 -C $(ROOT_DIR)/builddir
release_build: release_build:
meson --wipe builddir -Db_ndebug=true --buildtype release meson --wipe builddir -Db_ndebug=true --buildtype release
@ -23,10 +24,6 @@ debug_build:
meson setup --wipe builddir -Db_ndebug=true --buildtype debugoptimized meson setup --wipe builddir -Db_ndebug=true --buildtype debugoptimized
meson compile -j 10 -C builddir 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 run: build
ifeq '$(OS)' 'Windows_NT' ifeq '$(OS)' 'Windows_NT'
powershell "cp ./builddir/besos.exe ." powershell "cp ./builddir/besos.exe ."

Binary file not shown.

@ -4,7 +4,7 @@ constexpr const int WINDOW_WIDTH=1920;
constexpr const int WINDOW_HEIGHT=1080; constexpr const int WINDOW_HEIGHT=1080;
constexpr const int FRAME_LIMIT=60; constexpr const int FRAME_LIMIT=60;
constexpr const bool VSYNC=true; constexpr const bool VSYNC=true;
constexpr const int TITLE_SIZE=124; constexpr const int TITLE_SIZE=74;
constexpr const int CONTENT_SIZE=94; constexpr const int CONTENT_SIZE=64;
constexpr const int CONTROL_WIDTH=1000; constexpr const int CONTROL_WIDTH=1000;
constexpr const int CONTROL_HEIGHT=1000; constexpr const int CONTROL_HEIGHT=1000;

@ -1,6 +1,6 @@
# clang might need _LIBCPP_ENABLE_CXX26_REMOVED_CODECVT # clang might need _LIBCPP_ENABLE_CXX26_REMOVED_CODECVT
project('lel-sfml-starter', 'cpp', project('bezos-loves-slides', 'cpp',
version: '0.1.0', version: '0.1.0',
default_options: [ default_options: [
'cpp_std=c++20', 'cpp_std=c++20',
@ -90,7 +90,7 @@ tests = [
'tests/parsing.cpp' 'tests/parsing.cpp'
] ]
executable('besos', sources + ['main.cpp'], executable('bezos', sources + ['main.cpp'],
cpp_args: cpp_args, cpp_args: cpp_args,
link_args: link_args, link_args: link_args,
override_options: exe_defaults, override_options: exe_defaults,

@ -27,7 +27,7 @@ void Slide::init(lel::Cell& cell) {
$gui.layout( $gui.layout(
"[=*%(300,200)title|_|_]" "[=*%(300,200)title|_|_]"
"[_|_|_]" "[_|_|_]"
"[=*%(300,300)content|_|_]" "[=*%(300,400)content|_|_]"
"[_|_|_]" "[_|_|_]"
"[_|_|_]"); "[_|_|_]");
@ -58,7 +58,7 @@ SlidesUI::SlidesUI(shared_ptr<SlideDeck> deck) {
$gui.position(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT); $gui.position(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT);
$gui.layout( $gui.layout(
"[t_left|t_center|t_right]" "[t_left|t_center|t_right]"
"[m_left|*%(300,400)slide|_|_|m_right]" "[*%(300,400)slide|_|_|m_right|_]"
"[_|_|_|_|_]" "[_|_|_|_|_]"
"[_|_|_|_|_]" "[_|_|_|_|_]"
"[_|_|_|_|_]" "[_|_|_|_|_]"

Loading…
Cancel
Save