Did some work checking the build on OSX. Looks like clang 14 is too old, will try later version.

master
Zed A. Shaw 10 months ago
parent 8d9c2d8c05
commit 2a4ada81bb
  1. 5
      ansi_parser.cpp
  2. 4
      ansi_parser.rl
  3. 1
      lel.hpp
  4. 1
      lights.cpp
  5. 2
      map_view.cpp
  6. 23
      meson.build
  7. 3
      scripts/reset_build.sh

@ -367,5 +367,10 @@ _again:
}
}
(void)ansi_parser_first_final;
(void)ansi_parser_error;
(void)ansi_parser_en_main;
return good;
}

@ -159,5 +159,9 @@ bool ANSIParser::parse(std::wstring_view codes, ColorCB color_cb, WriteCB write_
}
}
(void)ansi_parser_first_final;
(void)ansi_parser_error;
(void)ansi_parser_en_main;
return good;
}

@ -3,6 +3,7 @@
#include <unordered_map>
#include <functional>
#include <optional>
#include <vector>
namespace lel {
using Row = std::vector<std::string>;

@ -22,7 +22,6 @@ namespace lighting {
* thing that would need to be calculated each time is the walls.
*/
void LightRender::render_light(LightSource source, Point at) {
Point min, max;
clear_light_target(at);
PointList has_light;

@ -40,7 +40,7 @@ namespace gui {
if(debug.PATHS && dnum != WALL_PATH_LIMIT) {
string num = dnum > 15 ? "*" : fmt::format("{:x}", dnum);
$canvas.DrawText(x * 2, y * 4, num, [dnum, tile, light_value](auto &pixel) {
$canvas.DrawText(x * 2, y * 4, num, [dnum, tile](auto &pixel) {
pixel.foreground_color = Color::HSV(dnum * 20, 150, 200);
pixel.background_color = Color::HSV(30, 20, tile.foreground[2] * 50 * PERCENT);
});

@ -16,9 +16,7 @@ catch2 = dependency('catch2-with-main')
fmt = dependency('fmt', allow_fallback: true)
json = dependency('nlohmann_json')
freetype2 = dependency('freetype2')
opengl32 = cc.find_library('opengl32', required: true)
winmm = cc.find_library('winmm', required: true)
gdi32 = cc.find_library('gdi32', required: true)
flac = dependency('flac')
ogg = dependency('ogg')
vorbis = dependency('vorbis')
@ -26,7 +24,6 @@ vorbisfile = dependency('vorbisfile')
vorbisenc = dependency('vorbisenc')
sfml_audio = dependency('sfml_audio')
sfml_graphics = dependency('sfml_graphics')
sfml_main = dependency('sfml_main')
sfml_network = dependency('sfml_network')
sfml_system = dependency('sfml_system')
sfml_window = dependency('sfml_window')
@ -35,13 +32,25 @@ ftxui_dom = dependency('ftxui-dom')
ftxui_component = dependency('ftxui-component')
dependencies = [
fmt, json, opengl32, freetype2,
fmt, json, freetype2,
flac, ogg, vorbis, vorbisfile, vorbisenc,
winmm, gdi32, sfml_audio, sfml_graphics,
sfml_main, sfml_network, sfml_system,
sfml_audio, sfml_graphics,
sfml_network, sfml_system,
sfml_window, ftxui_screen, ftxui_dom, ftxui_component
]
if build_machine.system() == 'windows'
sfml_main = dependency('sfml_main')
opengl32 = cc.find_library('opengl32', required: true)
winmm = cc.find_library('winmm', required: true)
gdi32 = cc.find_library('gdi32', required: true)
dependencies += [
opengl32, winmm, gdi32, sfml_main
]
endif
sources = [
'animator.cpp',
'ansi_parser.cpp',

@ -1,10 +1,9 @@
#!/usr/bin/env bash
set -e
mv -f ./subprojects/packagecache .
rm -rf subprojects builddir
mkdir subprojects
mv packagecache ./subprojects/
mv -f packagecache ./subprojects/ && true
mkdir builddir
cp wraps/*.wrap subprojects/
# on OSX you can't do this with static