Bug 1147839 - Fixed building installer on mingw. r=glandium

This commit is contained in:
Jacek Caban 2015-04-01 12:50:44 +02:00
parent 9a01a5b026
commit 2b4329a1bb
4 changed files with 9 additions and 5 deletions

View File

@ -94,6 +94,10 @@ ifdef GKMEDIAS_SHARED_LIBRARY
DEFINES += -DGKMEDIAS_SHARED_LIBRARY
endif
ifdef MAKENSISU
DEFINES += -DHAVE_MAKENSISU=1
endif
ifdef MOZ_PKG_MANIFEST_P
MOZ_PKG_MANIFEST = package-manifest

View File

@ -54,7 +54,7 @@
@RESPATH@/hyphenation/*
@RESPATH@/browser/@PREF_DIR@/firefox-l10n.js
@RESPATH@/browser/searchplugins/*
#ifdef XP_WIN32
#ifdef HAVE_MAKENSISU
@BINPATH@/uninstall/helper.exe
#endif
#ifdef MOZ_UPDATER

View File

@ -79,6 +79,10 @@ if test -n "$USE_ICU"; then
fi
MOZ_ICU_VERSION="$version"
if test "$OS_TARGET" = WINNT; then
MOZ_SHARED_ICU=1
fi
if test -z "${JS_STANDALONE}" -a -n "${JS_SHARED_LIBRARY}${MOZ_NATIVE_ICU}"; then
MOZ_SHARED_ICU=1
fi

View File

@ -9004,10 +9004,6 @@ if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
USE_ICU=1
fi
if test "$OS_TARGET" = WINNT; then
MOZ_SHARED_ICU=1
fi
MOZ_CONFIG_ICU()
if test -z "$JS_SHARED_LIBRARY"; then