Merge branch 'master' into sdl2.0

This commit is contained in:
Pere Pujal i Carabantes 2022-02-13 01:44:39 +01:00
commit 63fbd45cd1
175 changed files with 22028 additions and 10029 deletions

View file

@ -547,7 +547,7 @@ trans:
######
windows_ARCH_INSTALL:=install-dlls install-tpconf-i18n
windows_ARCH_INSTALL:=
macos_ARCH_INSTALL:=install-macbundle
ios_ARCH_INSTALL:=install-iosbundle
linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
@ -669,6 +669,9 @@ bdist-win32:
COMPLETIONDIR:=./win32/bdist \
INCLUDE_PREFIX:=./win32/bdist/plugins/include \
MAGIC_PREFIX:=./win32/bdist/plugins
make install-dlls install-tpconf-i18n \
BIN_PREFIX:=./win32/bdist \
LOCALE_PREFIX:=./win32/bdist/locale
# "make bdist-clean" deletes the 'bdist' directory
.PHONY: bdist-clean