diff --git a/bootstrap-carla.sh b/bootstrap-carla.sh index ae19453..ef6354a 100755 --- a/bootstrap-carla.sh +++ b/bootstrap-carla.sh @@ -204,6 +204,13 @@ if [ "${MACOS}" -eq 0 ]; then build_autoconf libffi "${LIBFFI_VERSION}" fi +# --------------------------------------------------------------------------------------------------------------------- +# wine bootstrap for python (needed for cross-compilation) + +if [ "${WIN32}" -eq 1 ] && [ -n "${EXE_WRAPPER}" ]; then + env WINEARCH="${PAWPAW_TARGET}" WINEDLLOVERRIDES="mscoree,mshtml=" wineboot -u +fi + # --------------------------------------------------------------------------------------------------------------------- # python diff --git a/patches/pyliblo/win32 b/patches/pyliblo/win32 deleted file mode 120000 index d66298e..0000000 --- a/patches/pyliblo/win32 +++ /dev/null @@ -1 +0,0 @@ -common \ No newline at end of file diff --git a/patches/pyliblo/win32/01_python3.7+-support.patch b/patches/pyliblo/win32/01_python3.7+-support.patch new file mode 120000 index 0000000..a0124d5 --- /dev/null +++ b/patches/pyliblo/win32/01_python3.7+-support.patch @@ -0,0 +1 @@ +../common/01_python3.7+-support.patch \ No newline at end of file diff --git a/patches/pyliblo/common/02_win32-build-fix.patch b/patches/pyliblo/win32/02_win32-build-fix.patch similarity index 100% rename from patches/pyliblo/common/02_win32-build-fix.patch rename to patches/pyliblo/win32/02_win32-build-fix.patch