diff --git a/Makefile.am b/Makefile.am index a670d92c..ed9f6a7e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,41 +12,3 @@ ACLOCAL_AMFLAGS = -I build/autotools/m4 test: lolcheck check: lolcheck -dist: lolunit-$(LOLUNIT_VERSION).tar.gz -dist: lolremez-$(LOLREMEZ_VERSION).tar.gz - -.PHONY: lolunit-$(LOLUNIT_VERSION).tar.gz -lolunit-$(LOLUNIT_VERSION).tar.gz: - rm -rf lolunit-$(LOLUNIT_VERSION) - mkdir lolunit-$(LOLUNIT_VERSION) - mkdir lolunit-$(LOLUNIT_VERSION)/lol - cp $(top_srcdir)/src/lol/unit.h lolunit-$(LOLUNIT_VERSION)/lol - tar cvzf lolunit-$(LOLUNIT_VERSION).tar.gz lolunit-$(LOLUNIT_VERSION) - rm -rf lolunit-$(LOLUNIT_VERSION) - -.PHONY: lolremez-$(LOLREMEZ_VERSION).tar.gz -lolremez-$(LOLREMEZ_VERSION).tar.gz: - rm -rf lolremez-$(LOLREMEZ_VERSION) - mkdir lolremez-$(LOLREMEZ_VERSION) - mkdir lolremez-$(LOLREMEZ_VERSION)/lol - mkdir lolremez-$(LOLREMEZ_VERSION)/lol/math - cat $(top_srcdir)/test/math/remez.cpp | sed '/#if/,/^$$/d' > \ - lolremez-$(LOLREMEZ_VERSION)/remez.cpp - cat $(top_srcdir)/src/real.cpp | sed 's@core.h@lol/math/real.h@' | sed '/#if/,/^$$/d' > \ - lolremez-$(LOLREMEZ_VERSION)/real.cpp - cp $(top_srcdir)/test/math/NEWS.txt \ - $(top_srcdir)/test/math/lolremez.sln \ - $(top_srcdir)/test/math/remez.vcxproj \ - $(top_srcdir)/test/math/remez.vcxproj.filters \ - lolremez-$(LOLREMEZ_VERSION)/ - cp $(top_srcdir)/src/lol/math/real.h \ - $(top_srcdir)/src/lol/math/vector.h \ - $(top_srcdir)/src/lol/math/remez.h \ - lolremez-$(LOLREMEZ_VERSION)/lol/math/ - printf 'remez: real.cpp remez.cpp\n' > lolremez-$(LOLREMEZ_VERSION)/Makefile - printf '\t$$(CXX) -I. -O2 -g -ggdb $$^ -o $$@\n' >> lolremez-$(LOLREMEZ_VERSION)/Makefile - printf 'clean:\n' >> lolremez-$(LOLREMEZ_VERSION)/Makefile - printf '\trm -f remez\n' >> lolremez-$(LOLREMEZ_VERSION)/Makefile - tar cvzf lolremez-$(LOLREMEZ_VERSION).tar.gz lolremez-$(LOLREMEZ_VERSION) - rm -rf lolremez-$(LOLREMEZ_VERSION) - diff --git a/src/3rdparty/Makefile.am b/src/3rdparty/Makefile.am index bb6a31e2..1b29226c 100644 --- a/src/3rdparty/Makefile.am +++ b/src/3rdparty/Makefile.am @@ -18,3 +18,9 @@ liblol_lua_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUA_ANSI include lol-lua.am +EXTRA_DIST += $(imgui_sources) $(mingw_std_threads_sources) $(pegtl_sources) + +include lol-imgui.am +include lol-mingw-std-threads.am +include lol-pegtl.am + diff --git a/src/3rdparty/lol-imgui.am b/src/3rdparty/lol-imgui.am new file mode 100644 index 00000000..38212b93 --- /dev/null +++ b/src/3rdparty/lol-imgui.am @@ -0,0 +1,10 @@ + +imgui_sources = \ + imgui/imconfig.h \ + imgui/imgui.cpp \ + imgui/imgui.h \ + imgui/stb_rect_pack.h \ + imgui/stb_textedit.h \ + imgui/stb_truetype.h \ + $(NULL) + diff --git a/src/3rdparty/lol-mingw-std-threads.am b/src/3rdparty/lol-mingw-std-threads.am new file mode 100644 index 00000000..9c30d5de --- /dev/null +++ b/src/3rdparty/lol-mingw-std-threads.am @@ -0,0 +1,7 @@ + +mingw_std_threads_sources = \ + mingw-std-threads/mingw.condition_variable.h \ + mingw-std-threads/mingw.mutex.h \ + mingw-std-threads/mingw.thread.h \ + $(NULL) + diff --git a/src/3rdparty/lol-pegtl.am b/src/3rdparty/lol-pegtl.am new file mode 100644 index 00000000..be0e0031 --- /dev/null +++ b/src/3rdparty/lol-pegtl.am @@ -0,0 +1,112 @@ + +pegtl_sources = \ + pegtl/pegtl.hh \ + pegtl/pegtl/action_input.hh \ + pegtl/pegtl/string_parser.hh \ + pegtl/pegtl/normal.hh \ + pegtl/pegtl/memory_input.hh \ + pegtl/pegtl/internal/peek_utf32.hh \ + pegtl/pegtl/internal/string.hh \ + pegtl/pegtl/internal/rep_min.hh \ + pegtl/pegtl/internal/enable.hh \ + pegtl/pegtl/internal/peek_char.hh \ + pegtl/pegtl/internal/plus.hh \ + pegtl/pegtl/internal/list_tail_pad.hh \ + pegtl/pegtl/internal/peek_utf8.hh \ + pegtl/pegtl/internal/not_at.hh \ + pegtl/pegtl/internal/require.hh \ + pegtl/pegtl/internal/input_data.hh \ + pegtl/pegtl/internal/istream_reader.hh \ + pegtl/pegtl/internal/pegtl_string.hh \ + pegtl/pegtl/internal/rule_match_one.hh \ + pegtl/pegtl/internal/list.hh \ + pegtl/pegtl/internal/range.hh \ + pegtl/pegtl/internal/skip_control.hh \ + pegtl/pegtl/internal/try_catch_type.hh \ + pegtl/pegtl/internal/result_on_found.hh \ + pegtl/pegtl/internal/list_tail.hh \ + pegtl/pegtl/internal/one.hh \ + pegtl/pegtl/internal/ranges.hh \ + pegtl/pegtl/internal/control.hh \ + pegtl/pegtl/internal/file_mapper.hh \ + pegtl/pegtl/internal/cstream_reader.hh \ + pegtl/pegtl/internal/sor.hh \ + pegtl/pegtl/internal/star.hh \ + pegtl/pegtl/internal/rule_match_three.hh \ + pegtl/pegtl/internal/if_then_else.hh \ + pegtl/pegtl/internal/discard.hh \ + pegtl/pegtl/internal/cstring_reader.hh \ + pegtl/pegtl/internal/rules.hh \ + pegtl/pegtl/internal/disable.hh \ + pegtl/pegtl/internal/eof.hh \ + pegtl/pegtl/internal/input_mark.hh \ + pegtl/pegtl/internal/list_must.hh \ + pegtl/pegtl/internal/rule_match_two.hh \ + pegtl/pegtl/internal/file_opener.hh \ + pegtl/pegtl/internal/demangle.hh \ + pegtl/pegtl/internal/until.hh \ + pegtl/pegtl/internal/discard_if.hh \ + pegtl/pegtl/internal/raise.hh \ + pegtl/pegtl/internal/if_must_else.hh \ + pegtl/pegtl/internal/demangle_nop.hh \ + pegtl/pegtl/internal/star_must.hh \ + pegtl/pegtl/internal/rep_min_max.hh \ + pegtl/pegtl/internal/state.hh \ + pegtl/pegtl/internal/bump_util.hh \ + pegtl/pegtl/internal/minus.hh \ + pegtl/pegtl/internal/input_pair.hh \ + pegtl/pegtl/internal/peek_utf16.hh \ + pegtl/pegtl/internal/rep.hh \ + pegtl/pegtl/internal/eol.hh \ + pegtl/pegtl/internal/if_must.hh \ + pegtl/pegtl/internal/pad.hh \ + pegtl/pegtl/internal/rep_opt.hh \ + pegtl/pegtl/internal/at.hh \ + pegtl/pegtl/internal/action.hh \ + pegtl/pegtl/internal/istring.hh \ + pegtl/pegtl/internal/must.hh \ + pegtl/pegtl/internal/any.hh \ + pegtl/pegtl/internal/opt.hh \ + pegtl/pegtl/internal/seq.hh \ + pegtl/pegtl/internal/file_reader.hh \ + pegtl/pegtl/internal/bytes.hh \ + pegtl/pegtl/internal/rule_conjunction.hh \ + pegtl/pegtl/internal/eolf.hh \ + pegtl/pegtl/internal/pad_opt.hh \ + pegtl/pegtl/internal/trivial.hh \ + pegtl/pegtl/internal/demangle_cxxabi.hh \ + pegtl/pegtl/ascii.hh \ + pegtl/pegtl/utf32.hh \ + pegtl/pegtl/utf8.hh \ + pegtl/pegtl/rules.hh \ + pegtl/pegtl/parse_error.hh \ + pegtl/pegtl/apply_mode.hh \ + pegtl/pegtl/position_info.hh \ + pegtl/pegtl/utf16.hh \ + pegtl/pegtl/mmap_parser.hh \ + pegtl/pegtl/input_error.hh \ + pegtl/pegtl/parse.hh \ + pegtl/pegtl/contrib/abnf.hh \ + pegtl/pegtl/contrib/unescape.hh \ + pegtl/pegtl/contrib/http.hh \ + pegtl/pegtl/contrib/changes.hh \ + pegtl/pegtl/contrib/uri.hh \ + pegtl/pegtl/contrib/raw_string.hh \ + pegtl/pegtl/contrib/alphabet.hh \ + pegtl/pegtl/contrib/json.hh \ + pegtl/pegtl/read_parser.hh \ + pegtl/pegtl/trace.hh \ + pegtl/pegtl/analyze.hh \ + pegtl/pegtl/analysis/rule_info.hh \ + pegtl/pegtl/analysis/grammar_info.hh \ + pegtl/pegtl/analysis/analyze_cycles.hh \ + pegtl/pegtl/analysis/rule_type.hh \ + pegtl/pegtl/analysis/generic.hh \ + pegtl/pegtl/analysis/insert_rules.hh \ + pegtl/pegtl/analysis/counted.hh \ + pegtl/pegtl/analysis/insert_guard.hh \ + pegtl/pegtl/file_parser.hh \ + pegtl/pegtl/nothing.hh \ + pegtl/pegtl/buffer_input.hh \ + $(NULL) + diff --git a/src/Makefile.am b/src/Makefile.am index c302ea2d..1a71dfbe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,8 +8,8 @@ noinst_LIBRARIES = liblol-core.a liblol_core_a_SOURCES = \ tiler.cpp tiler.h dict.cpp dict.h lolgl.h \ audio.cpp audio.h scene.cpp scene.h font.cpp font.h \ - textureimage.cpp textureimage.h tileset.cpp tileset.h \ - forge.cpp forge.h video.cpp video.h \ + textureimage.cpp textureimage.h textureimage-private.h \ + tileset.cpp tileset.h forge.cpp forge.h video.cpp video.h \ sample.cpp sample.h sampler.cpp sampler.h \ profiler.cpp profiler.h text.cpp text.h emitter.cpp emitter.h \ numeric.h utils.h messageservice.cpp messageservice.h \ diff --git a/src/t/Makefile.am b/src/t/Makefile.am index 6514e52f..baac5afb 100644 --- a/src/t/Makefile.am +++ b/src/t/Makefile.am @@ -42,5 +42,5 @@ test_entity_SOURCES = test-common.cpp \ test_entity_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tools/lolunit test_entity_DEPENDENCIES = @LOL_DEPS@ -noinst_DATA = data/gradient.png +EXTRA_DIST += data/gradient.png diff --git a/tools/lolremez/Makefile.am b/tools/lolremez/Makefile.am index 298d5a4a..e07526b6 100644 --- a/tools/lolremez/Makefile.am +++ b/tools/lolremez/Makefile.am @@ -8,7 +8,7 @@ noinst_PROGRAMS = lolremez endif lolremez_SOURCES = \ - lolremez.cpp solver.cpp solver.h matrix.h + lolremez.cpp solver.cpp solver.h matrix.h expression.h lolremez_CPPFLAGS = $(AM_CPPFLAGS) lolremez_DEPENDENCIES = @LOL_DEPS@