diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-15 11:51:43 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-15 11:51:43 +0200 |
| commit | bdd013826b8acbdef0ae43233d7a6a32e1161966 (patch) | |
| tree | 83904a8337bfb28e1fa059afe5bc088a8b454688 /application/palemoon/installer/Makefile.in | |
| parent | fca67bb95d4cda5046365e124e79ec583c336697 (diff) | |
| parent | 8a95c03dcd2a7f2c6d64b6ee917f6cb363e9ca60 (diff) | |
| download | UXP-bdd013826b8acbdef0ae43233d7a6a32e1161966.tar UXP-bdd013826b8acbdef0ae43233d7a6a32e1161966.tar.gz UXP-bdd013826b8acbdef0ae43233d7a6a32e1161966.tar.lz UXP-bdd013826b8acbdef0ae43233d7a6a32e1161966.tar.xz UXP-bdd013826b8acbdef0ae43233d7a6a32e1161966.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'application/palemoon/installer/Makefile.in')
| -rw-r--r-- | application/palemoon/installer/Makefile.in | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/application/palemoon/installer/Makefile.in b/application/palemoon/installer/Makefile.in index 7ba8ae9e8..7cd77bdca 100644 --- a/application/palemoon/installer/Makefile.in +++ b/application/palemoon/installer/Makefile.in @@ -65,18 +65,14 @@ endif DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) # Set MSVC dlls version to package, if any. -ifdef WIN32_REDIST_DIR 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_CXX_RUNTIME_DLL=$(MSVC_CXX_RUNTIME_DLL) -DEFINES += -DMSVC_OPENMP_DLL=$(MSVC_OPENMP_DLL) -ifdef MSVC_APPCRT_DLL -DEFINES += -DMSVC_APPCRT_DLL=$(MSVC_APPCRT_DLL) -endif -ifdef MSVC_DESKTOPCRT_DLL -DEFINES += -DMSVC_DESKTOPCRT_DLL=$(MSVC_DESKTOPCRT_DLL) endif +ifdef WIN_UCRT_REDIST_DIR +DEFINES += -DMOZ_PACKAGE_WIN_UCRT_DLLS=1 endif endif @@ -161,7 +157,7 @@ endif libs:: - $(MAKE) -C $(DEPTH)/browser/locales langpack + $(MAKE) -C $(DEPTH)/application/palemoon/locales langpack ifeq (WINNT,$(OS_ARCH)) PKGCOMP_FIND_OPTS = |