瀏覽代碼

build: add several missing distributed files for Windows versions.

legacy
Sam Hocevar 7 年之前
父節點
當前提交
ee622b762f
共有 5 個檔案被更改,包括 112 行新增90 行删除
  1. +10
    -0
      build/Makefile.am
  2. +2
    -0
      src/3rdparty/Makefile.am
  3. +1
    -0
      src/3rdparty/lol-imgui.am
  4. +97
    -90
      src/3rdparty/lol-pegtl.am
  5. +2
    -0
      src/Makefile.am

+ 10
- 0
build/Makefile.am 查看文件

@@ -1,11 +1,21 @@


include $(top_srcdir)/build/autotools/common.am include $(top_srcdir)/build/autotools/common.am


# FIXME: can't include "Lol (vs2015).sln" because of the spaces

EXTRA_DIST += lol-build \ EXTRA_DIST += lol-build \
check-source.sh run-bitten.sh \ check-source.sh run-bitten.sh \
build-linux build-mingw build-mingw64 \ build-linux build-mingw build-mingw64 \
build-nacl32 build-nacl64 build-android build-html \ build-nacl32 build-nacl64 build-android build-html \
\ \
msbuild/lolfx.targets \
msbuild/config-build.xml \
msbuild/lolfx.xml \
msbuild/lolfx.props \
msbuild/lol.config.props \
msbuild/lol.vars.props \
msbuild/lol.rules.props \
\
autotools/common.am autotools/common.am


TESTS = check-source.sh TESTS = check-source.sh


+ 2
- 0
src/3rdparty/Makefile.am 查看文件

@@ -19,6 +19,8 @@ liblol_lua_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUA_ANSI
include lol-lua.am include lol-lua.am


EXTRA_DIST += $(imgui_sources) $(mingw_std_threads_sources) $(pegtl_sources) EXTRA_DIST += $(imgui_sources) $(mingw_std_threads_sources) $(pegtl_sources)
EXTRA_DIST += lol-bullet.vcxproj
EXTRA_DIST += lol-lua.vcxproj


include lol-imgui.am include lol-imgui.am
include lol-mingw-std-threads.am include lol-mingw-std-threads.am


+ 1
- 0
src/3rdparty/lol-imgui.am 查看文件

@@ -3,6 +3,7 @@ imgui_sources = \
imgui/imconfig.h \ imgui/imconfig.h \
imgui/imgui.cpp \ imgui/imgui.cpp \
imgui/imgui.h \ imgui/imgui.h \
imgui/imgui_internal.h \
imgui/stb_rect_pack.h \ imgui/stb_rect_pack.h \
imgui/stb_textedit.h \ imgui/stb_textedit.h \
imgui/stb_truetype.h \ imgui/stb_truetype.h \


+ 97
- 90
src/3rdparty/lol-pegtl.am 查看文件

@@ -1,112 +1,119 @@


pegtl_sources = \ pegtl_sources = \
pegtl/pegtl.hh \
pegtl/pegtl/action_input.hh \ pegtl/pegtl/action_input.hh \
pegtl/pegtl/string_parser.hh \ pegtl/pegtl/analysis/analyze_cycles.hh \
pegtl/pegtl/normal.hh \ pegtl/pegtl/analysis/counted.hh \
pegtl/pegtl/memory_input.hh \ pegtl/pegtl/analysis/generic.hh \
pegtl/pegtl/internal/peek_utf32.hh \ pegtl/pegtl/analysis/grammar_info.hh \
pegtl/pegtl/internal/string.hh \ pegtl/pegtl/analysis/insert_guard.hh \
pegtl/pegtl/internal/rep_min.hh \ pegtl/pegtl/analysis/insert_rules.hh \
pegtl/pegtl/internal/enable.hh \ pegtl/pegtl/analysis/rule_info.hh \
pegtl/pegtl/internal/peek_char.hh \ pegtl/pegtl/analysis/rule_type.hh \
pegtl/pegtl/internal/plus.hh \ pegtl/pegtl/analyze.hh \
pegtl/pegtl/internal/list_tail_pad.hh \ pegtl/pegtl/apply_mode.hh \
pegtl/pegtl/internal/peek_utf8.hh \ pegtl/pegtl/ascii.hh \
pegtl/pegtl/internal/not_at.hh \ pegtl/pegtl/buffer_input.hh \
pegtl/pegtl/internal/require.hh \ pegtl/pegtl/contrib/abnf.hh \
pegtl/pegtl/internal/input_data.hh \ pegtl/pegtl/contrib/alphabet.hh \
pegtl/pegtl/internal/istream_reader.hh \ pegtl/pegtl/contrib/changes.hh \
pegtl/pegtl/internal/pegtl_string.hh \ pegtl/pegtl/contrib/http.hh \
pegtl/pegtl/internal/rule_match_one.hh \ pegtl/pegtl/contrib/json.hh \
pegtl/pegtl/internal/list.hh \ pegtl/pegtl/contrib/raw_string.hh \
pegtl/pegtl/internal/range.hh \ pegtl/pegtl/contrib/unescape.hh \
pegtl/pegtl/internal/skip_control.hh \ pegtl/pegtl/contrib/uri.hh \
pegtl/pegtl/internal/try_catch_type.hh \ pegtl/pegtl/cr_crlf_eol.hh \
pegtl/pegtl/internal/result_on_found.hh \ pegtl/pegtl/cr_eol.hh \
pegtl/pegtl/internal/list_tail.hh \ pegtl/pegtl/crlf_eol.hh \
pegtl/pegtl/internal/one.hh \ pegtl/pegtl/eol.hh \
pegtl/pegtl/internal/ranges.hh \ pegtl/pegtl/file_parser.hh \
pegtl/pegtl.hh \
pegtl/pegtl/input_error.hh \
pegtl/pegtl/internal/action.hh \
pegtl/pegtl/internal/any.hh \
pegtl/pegtl/internal/at.hh \
pegtl/pegtl/internal/bump_util.hh \
pegtl/pegtl/internal/bytes.hh \
pegtl/pegtl/internal/control.hh \ pegtl/pegtl/internal/control.hh \
pegtl/pegtl/internal/file_mapper.hh \
pegtl/pegtl/internal/cstream_reader.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/cstring_reader.hh \
pegtl/pegtl/internal/rules.hh \ pegtl/pegtl/internal/demangle_cxxabi.hh \
pegtl/pegtl/internal/demangle.hh \
pegtl/pegtl/internal/demangle_nop.hh \
pegtl/pegtl/internal/disable.hh \ pegtl/pegtl/internal/disable.hh \
pegtl/pegtl/internal/discard.hh \
pegtl/pegtl/internal/discard_if.hh \
pegtl/pegtl/internal/enable.hh \
pegtl/pegtl/internal/eof.hh \ pegtl/pegtl/internal/eof.hh \
pegtl/pegtl/internal/input_mark.hh \ pegtl/pegtl/internal/eolf.hh \
pegtl/pegtl/internal/list_must.hh \ pegtl/pegtl/internal/eol.hh \
pegtl/pegtl/internal/rule_match_two.hh \ pegtl/pegtl/internal/eol_impl.hh \
pegtl/pegtl/internal/file_mapper.hh \
pegtl/pegtl/internal/file_opener.hh \ pegtl/pegtl/internal/file_opener.hh \
pegtl/pegtl/internal/demangle.hh \ pegtl/pegtl/internal/file_reader.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/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/if_must.hh \
pegtl/pegtl/internal/pad.hh \ pegtl/pegtl/internal/if_then_else.hh \
pegtl/pegtl/internal/rep_opt.hh \ pegtl/pegtl/internal/input_data.hh \
pegtl/pegtl/internal/at.hh \ pegtl/pegtl/internal/input_mark.hh \
pegtl/pegtl/internal/action.hh \ pegtl/pegtl/internal/input_pair.hh \
pegtl/pegtl/internal/istream_reader.hh \
pegtl/pegtl/internal/istring.hh \ pegtl/pegtl/internal/istring.hh \
pegtl/pegtl/internal/list.hh \
pegtl/pegtl/internal/list_must.hh \
pegtl/pegtl/internal/list_tail.hh \
pegtl/pegtl/internal/list_tail_pad.hh \
pegtl/pegtl/internal/minus.hh \
pegtl/pegtl/internal/must.hh \ pegtl/pegtl/internal/must.hh \
pegtl/pegtl/internal/any.hh \ pegtl/pegtl/internal/not_at.hh \
pegtl/pegtl/internal/one.hh \
pegtl/pegtl/internal/opt.hh \ pegtl/pegtl/internal/opt.hh \
pegtl/pegtl/internal/seq.hh \ pegtl/pegtl/internal/pad.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/pad_opt.hh \
pegtl/pegtl/internal/peek_char.hh \
pegtl/pegtl/internal/peek_utf16.hh \
pegtl/pegtl/internal/peek_utf32.hh \
pegtl/pegtl/internal/peek_utf8.hh \
pegtl/pegtl/internal/pegtl_string.hh \
pegtl/pegtl/internal/plus.hh \
pegtl/pegtl/internal/raise.hh \
pegtl/pegtl/internal/range.hh \
pegtl/pegtl/internal/ranges.hh \
pegtl/pegtl/internal/rep.hh \
pegtl/pegtl/internal/rep_min.hh \
pegtl/pegtl/internal/rep_min_max.hh \
pegtl/pegtl/internal/rep_opt.hh \
pegtl/pegtl/internal/require.hh \
pegtl/pegtl/internal/result_on_found.hh \
pegtl/pegtl/internal/rule_conjunction.hh \
pegtl/pegtl/internal/rule_match_one.hh \
pegtl/pegtl/internal/rule_match_three.hh \
pegtl/pegtl/internal/rule_match_two.hh \
pegtl/pegtl/internal/rules.hh \
pegtl/pegtl/internal/seq.hh \
pegtl/pegtl/internal/skip_control.hh \
pegtl/pegtl/internal/sor.hh \
pegtl/pegtl/internal/star.hh \
pegtl/pegtl/internal/star_must.hh \
pegtl/pegtl/internal/state.hh \
pegtl/pegtl/internal/string.hh \
pegtl/pegtl/internal/trivial.hh \ pegtl/pegtl/internal/trivial.hh \
pegtl/pegtl/internal/demangle_cxxabi.hh \ pegtl/pegtl/internal/try_catch_type.hh \
pegtl/pegtl/ascii.hh \ pegtl/pegtl/internal/until.hh \
pegtl/pegtl/utf32.hh \ pegtl/pegtl/lf_crlf_eol.hh \
pegtl/pegtl/utf8.hh \ pegtl/pegtl/lf_eol.hh \
pegtl/pegtl/rules.hh \ pegtl/pegtl/memory_input.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/mmap_parser.hh \
pegtl/pegtl/input_error.hh \ pegtl/pegtl/normal.hh \
pegtl/pegtl/nothing.hh \
pegtl/pegtl/parse_error.hh \
pegtl/pegtl/parse.hh \ pegtl/pegtl/parse.hh \
pegtl/pegtl/contrib/abnf.hh \ pegtl/pegtl/position_info.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/read_parser.hh \
pegtl/pegtl/rules.hh \
pegtl/pegtl/string_parser.hh \
pegtl/pegtl/trace.hh \ pegtl/pegtl/trace.hh \
pegtl/pegtl/analyze.hh \ pegtl/pegtl/utf16.hh \
pegtl/pegtl/analysis/rule_info.hh \ pegtl/pegtl/utf32.hh \
pegtl/pegtl/analysis/grammar_info.hh \ pegtl/pegtl/utf8.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) $(NULL)



+ 2
- 0
src/Makefile.am 查看文件

@@ -5,6 +5,8 @@ SUBDIRS = 3rdparty data . t


noinst_LIBRARIES = liblol-core.a noinst_LIBRARIES = liblol-core.a


EXTRA_DIST = lol-core.vcxproj

liblol_core_a_SOURCES = \ liblol_core_a_SOURCES = \
tiler.cpp tiler.h dict.cpp dict.h lolgl.h \ tiler.cpp tiler.h dict.cpp dict.h lolgl.h \
scene.cpp scene.h font.cpp font.h \ scene.cpp scene.h font.cpp font.h \


||||||
x
 
000:0
Loading…
取消
儲存