-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Windows builds with Haxe 3 fail
- Loading branch information
Showing
1 changed file
with
8 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -126,13 +126,13 @@ runs: | |
} | ||
echo "::group::Setup Lua: Install mingw/pcre" | ||
# for Haxe < 4.3 | ||
install_mingw_package "pcre" "8.45-1" | ||
lualib_install_opts+=" PCRE_INCDIR=$(cygpath -wsa /include) PCRE_LIBDIR=$(cygpath -wsa /lib)" | ||
# for Haxe < 4.3 | ||
install_mingw_package "pcre" "8.45-1" | ||
lualib_install_opts+=" PCRE_INCDIR=$(cygpath -wsa /include) PCRE_LIBDIR=$(cygpath -wsa /lib)" | ||
# for Haxe >= 4.3 | ||
install_mingw_package "pcre2" "10.43-2" | ||
lualib_install_opts+=" PCRE2_INCDIR=$(cygpath -wsa /include) PCRE2_LIBDIR=$(cygpath -wsa /lib)" | ||
# for Haxe >= 4.3 | ||
install_mingw_package "pcre2" "10.44-1" | ||
lualib_install_opts+=" PCRE2_INCDIR=$(cygpath -wsa /include) PCRE2_LIBDIR=$(cygpath -wsa /lib)" | ||
echo "::endgroup::" | ||
echo "::group::Setup Lua: Install mingw/openssl" | ||
|
@@ -148,9 +148,8 @@ runs: | |
echo "::endgroup::" | ||
echo "::group::Setup Lua: Patch luarocks/environ" # for Haxe 3 | ||
# https://github.com/moteus/lua-environ/issues/1 | ||
curl -sSfL https://raw.githubusercontent.com/moteus/lua-environ/master/rockspecs/environ-0.1.0-1.rockspec | grep -v 'libraries = {"user32"},' > $CACHE_FOLDER/environ-0.1.0-1.rockspec | ||
lualibs+=" $(cygpath -wa "$CACHE_FOLDER/environ-0.1.0-1.rockspec")" | ||
curl -sSfL https://raw.githubusercontent.com/sebthom/hx-lua-environ/master/rockspecs/environ-scm-0.rockspec -o $CACHE_FOLDER/environ-scm-0.rockspec | ||
lualibs+=" $(cygpath -wa "$CACHE_FOLDER/environ-scm-0.rockspec")" | ||
#lualibs+=" [email protected]" | ||
echo "::endgroup::" | ||
;; | ||
|