wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-08-15 08:53:07 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix installer missing dlls

Browse source
This commit is contained in:
K4sum1 2025-03-24 19:13:51 -07:00
commit 8840299c26
8 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
application/basilisk/installer/Makefile.in
View file

@ -69,6 +69,7 @@ ifdef MOZ_NO_DEBUG_RTL
ifdef WIN32_REDIST_DIR
DEFINES += -DMOZ_PACKAGE_MSVC_DLLS=1
DEFINES += -DMSVC_C_RUNTIME_DLL=$(MSVC_C_RUNTIME_DLL)
DEFINES += -DMSVC_CMP_RUNTIME_DLL=$(MSVC_CMP_RUNTIME_DLL)
DEFINES += -DMSVC_CXX_RUNTIME_DLL=$(MSVC_CXX_RUNTIME_DLL)
endif
ifdef WIN_UCRT_REDIST_DIR

1
application/basilisk/installer/package-manifest.in
View file

@ -100,6 +100,7 @@
@BINPATH@/plugin-hang-ui@BIN_SUFFIX@
#if MOZ_PACKAGE_MSVC_DLLS
@BINPATH@/@MSVC_C_RUNTIME_DLL@
@BINPATH@/@MSVC_CMP_RUNTIME_DLL@
@BINPATH@/@MSVC_CXX_RUNTIME_DLL@
#endif
#if MOZ_PACKAGE_WIN_UCRT_DLLS

1
application/palemoon/installer/Makefile.in
View file

@ -72,6 +72,7 @@ ifdef MOZ_NO_DEBUG_RTL
ifdef WIN32_REDIST_DIR
DEFINES += -DMOZ_PACKAGE_MSVC_DLLS=1
DEFINES += -DMSVC_C_RUNTIME_DLL=$(MSVC_C_RUNTIME_DLL)
DEFINES += -DMSVC_CMP_RUNTIME_DLL=$(MSVC_CMP_RUNTIME_DLL)
DEFINES += -DMSVC_CXX_RUNTIME_DLL=$(MSVC_CXX_RUNTIME_DLL)
endif
ifdef WIN_UCRT_REDIST_DIR

1
application/palemoon/installer/package-manifest.in
View file

@ -84,6 +84,7 @@
@BINPATH@/plugin-hang-ui@BIN_SUFFIX@
#if MOZ_PACKAGE_MSVC_DLLS
@BINPATH@/@MSVC_C_RUNTIME_DLL@
@BINPATH@/@MSVC_CMP_RUNTIME_DLL@
@BINPATH@/@MSVC_CXX_RUNTIME_DLL@
#endif
#if MOZ_PACKAGE_WIN_UCRT_DLLS

2
build/win32/moz.build
View file

@ -15,7 +15,7 @@ if CONFIG['ENABLE_TESTS']:
NO_PGO = True
if CONFIG['WIN32_REDIST_DIR'] and CONFIG['COMPILE_ENVIRONMENT']:
for f in ['MSVC_C_RUNTIME_DLL', 'MSVC_CXX_RUNTIME_DLL']:
for f in ['MSVC_C_RUNTIME_DLL', 'MSVC_CMP_RUNTIME_DLL', 'MSVC_CXX_RUNTIME_DLL']:
FINAL_TARGET_FILES += [
'%%%s/%s' % (CONFIG['WIN32_REDIST_DIR'], CONFIG[f])
]

4
js/src/old-configure.in
View file

@ -193,7 +193,8 @@ case "$target" in
19*)
_CC_SUITE=14
MSVS_VERSION=2015
MSVC_C_RUNTIME_DLL=vcruntime140.dll
MSVC_C_RUNTIME_DLL=vcruntime*.dll
MSVC_CMP_RUNTIME_DLL=vcomp140.dll
MSVC_CXX_RUNTIME_DLL=msvcp140.dll
# C5026: move constructor was implicitly defined as deleted
@ -212,6 +213,7 @@ case "$target" in
esac
AC_SUBST(MSVS_VERSION)
AC_SUBST(MSVC_C_RUNTIME_DLL)
AC_SUBST(MSVC_CMP_RUNTIME_DLL)
AC_SUBST(MSVC_CXX_RUNTIME_DLL)
# Check linker version

4
old-configure.in
View file

@ -185,7 +185,8 @@ case "$target" in
19*)
_CC_SUITE=14
MSVS_VERSION=2015
MSVC_C_RUNTIME_DLL=vcruntime140.dll
MSVC_C_RUNTIME_DLL=vcruntime*.dll
MSVC_CMP_RUNTIME_DLL=vcomp140.dll
MSVC_CXX_RUNTIME_DLL=msvcp140.dll
MOZ_CHECK_HEADER(dia2.h, MSVC_HAS_DIA_SDK=1)
@ -236,6 +237,7 @@ case "$target" in
AC_SUBST(MSVS_VERSION)
AC_SUBST(MSVC_HAS_DIA_SDK)
AC_SUBST(MSVC_C_RUNTIME_DLL)
AC_SUBST(MSVC_CMP_RUNTIME_DLL)
AC_SUBST(MSVC_CXX_RUNTIME_DLL)
AC_DEFINE(HAVE_SEH_EXCEPTIONS)

3
toolkit/mozapps/installer/upload-files.mk
View file

@ -76,6 +76,9 @@ endif # MOZ_FOLD_LIBS
ifdef MSVC_C_RUNTIME_DLL
JSSHELL_BINS += $(MSVC_C_RUNTIME_DLL)
endif
ifdef MSVC_CMP_RUNTIME_DLL
JSSHELL_BINS += $(MSVC_CMP_RUNTIME_DLL)
endif
ifdef MSVC_CXX_RUNTIME_DLL
JSSHELL_BINS += $(MSVC_CXX_RUNTIME_DLL)
endif