diff --git a/build/Makefile.am b/build/Makefile.am index 69676fb8..d1644e80 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -1,11 +1,21 @@ include $(top_srcdir)/build/autotools/common.am +# FIXME: can't include "Lol (vs2015).sln" because of the spaces + EXTRA_DIST += lol-build \ check-source.sh run-bitten.sh \ build-linux build-mingw build-mingw64 \ 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 TESTS = check-source.sh diff --git a/src/3rdparty/Makefile.am b/src/3rdparty/Makefile.am index 1b29226c..ecae9949 100644 --- a/src/3rdparty/Makefile.am +++ b/src/3rdparty/Makefile.am @@ -19,6 +19,8 @@ liblol_lua_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUA_ANSI include lol-lua.am 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-mingw-std-threads.am diff --git a/src/3rdparty/lol-imgui.am b/src/3rdparty/lol-imgui.am index 38212b93..c03b6de9 100644 --- a/src/3rdparty/lol-imgui.am +++ b/src/3rdparty/lol-imgui.am @@ -3,6 +3,7 @@ imgui_sources = \ imgui/imconfig.h \ imgui/imgui.cpp \ imgui/imgui.h \ + imgui/imgui_internal.h \ imgui/stb_rect_pack.h \ imgui/stb_textedit.h \ imgui/stb_truetype.h \ diff --git a/src/3rdparty/lol-pegtl.am b/src/3rdparty/lol-pegtl.am index be0e0031..ec4de00f 100644 --- a/src/3rdparty/lol-pegtl.am +++ b/src/3rdparty/lol-pegtl.am @@ -1,112 +1,119 @@ 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/analysis/analyze_cycles.hh \ + pegtl/pegtl/analysis/counted.hh \ + pegtl/pegtl/analysis/generic.hh \ + pegtl/pegtl/analysis/grammar_info.hh \ + pegtl/pegtl/analysis/insert_guard.hh \ + pegtl/pegtl/analysis/insert_rules.hh \ + pegtl/pegtl/analysis/rule_info.hh \ + pegtl/pegtl/analysis/rule_type.hh \ + pegtl/pegtl/analyze.hh \ + pegtl/pegtl/apply_mode.hh \ + pegtl/pegtl/ascii.hh \ + pegtl/pegtl/buffer_input.hh \ + pegtl/pegtl/contrib/abnf.hh \ + pegtl/pegtl/contrib/alphabet.hh \ + pegtl/pegtl/contrib/changes.hh \ + pegtl/pegtl/contrib/http.hh \ + pegtl/pegtl/contrib/json.hh \ + pegtl/pegtl/contrib/raw_string.hh \ + pegtl/pegtl/contrib/unescape.hh \ + pegtl/pegtl/contrib/uri.hh \ + pegtl/pegtl/cr_crlf_eol.hh \ + pegtl/pegtl/cr_eol.hh \ + pegtl/pegtl/crlf_eol.hh \ + pegtl/pegtl/eol.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/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/demangle_cxxabi.hh \ + pegtl/pegtl/internal/demangle.hh \ + pegtl/pegtl/internal/demangle_nop.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/input_mark.hh \ - pegtl/pegtl/internal/list_must.hh \ - pegtl/pegtl/internal/rule_match_two.hh \ + pegtl/pegtl/internal/eolf.hh \ + pegtl/pegtl/internal/eol.hh \ + pegtl/pegtl/internal/eol_impl.hh \ + pegtl/pegtl/internal/file_mapper.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/file_reader.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/if_then_else.hh \ + pegtl/pegtl/internal/input_data.hh \ + pegtl/pegtl/internal/input_mark.hh \ + pegtl/pegtl/internal/input_pair.hh \ + pegtl/pegtl/internal/istream_reader.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/any.hh \ + pegtl/pegtl/internal/not_at.hh \ + pegtl/pegtl/internal/one.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.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/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/internal/try_catch_type.hh \ + pegtl/pegtl/internal/until.hh \ + pegtl/pegtl/lf_crlf_eol.hh \ + pegtl/pegtl/lf_eol.hh \ + pegtl/pegtl/memory_input.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/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/position_info.hh \ pegtl/pegtl/read_parser.hh \ + pegtl/pegtl/rules.hh \ + pegtl/pegtl/string_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 \ + pegtl/pegtl/utf16.hh \ + pegtl/pegtl/utf32.hh \ + pegtl/pegtl/utf8.hh \ $(NULL) diff --git a/src/Makefile.am b/src/Makefile.am index a8541d94..632408c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,6 +5,8 @@ SUBDIRS = 3rdparty data . t noinst_LIBRARIES = liblol-core.a +EXTRA_DIST = lol-core.vcxproj + liblol_core_a_SOURCES = \ tiler.cpp tiler.h dict.cpp dict.h lolgl.h \ scene.cpp scene.h font.cpp font.h \