зеркало из https://github.com/mozilla/gecko-dev.git
XRE build changes for windows mobile. b=420240, r=bsmedberg, a=beltzner
This commit is contained in:
Родитель
19b228e5ae
Коммит
0069a6f866
|
@ -74,6 +74,10 @@ ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
|
||||||
CPPSRCS += dlldeps-xul.cpp
|
CPPSRCS += dlldeps-xul.cpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(OS_ARCH),WINCE)
|
||||||
|
CPPSRCS += dlldeps-xul.cpp
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(OS_ARCH),OS2)
|
ifeq ($(OS_ARCH),OS2)
|
||||||
CPPSRCS += dlldeps-xul.cpp
|
CPPSRCS += dlldeps-xul.cpp
|
||||||
endif
|
endif
|
||||||
|
@ -228,6 +232,10 @@ ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
|
||||||
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,imagehlp)
|
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,imagehlp)
|
||||||
endif
|
endif
|
||||||
endif # WINNT
|
endif # WINNT
|
||||||
|
ifeq ($(OS_ARCH),WINCE)
|
||||||
|
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, aygshell cellcore uuid ole32 oleaut32 )
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
ifdef MOZ_JPROF
|
ifdef MOZ_JPROF
|
||||||
EXTRA_DSO_LDOPTS += -ljprof
|
EXTRA_DSO_LDOPTS += -ljprof
|
||||||
|
|
|
@ -74,8 +74,10 @@ DEFINES += \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
|
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
|
||||||
|
ifneq ($(OS_ARCH),WINCE)
|
||||||
OS_LIBS += $(call EXPAND_LIBNAME,usp10)
|
OS_LIBS += $(call EXPAND_LIBNAME,usp10)
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),mac cocoa))
|
ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),mac cocoa))
|
||||||
EXTRA_DSO_LDOPTS += -lcups
|
EXTRA_DSO_LDOPTS += -lcups
|
||||||
ifdef MOZ_ENABLE_GLITZ
|
ifdef MOZ_ENABLE_GLITZ
|
||||||
|
|
|
@ -92,7 +92,7 @@ XPIDLSRCS = \
|
||||||
nsIXULRuntime.idl \
|
nsIXULRuntime.idl \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
ifeq ($(OS_ARCH),WINNT)
|
ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
|
||||||
XPIDLSRCS += nsIWinAppHelper.idl
|
XPIDLSRCS += nsIWinAppHelper.idl
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -126,7 +126,11 @@ DEFINES += -DMOZ_UPDATER
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
|
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
|
||||||
|
ifdef WINCE
|
||||||
|
CPPSRCS += nsNativeAppSupportDefault.cpp
|
||||||
|
else
|
||||||
CPPSRCS += nsNativeAppSupportWin.cpp
|
CPPSRCS += nsNativeAppSupportWin.cpp
|
||||||
|
endif
|
||||||
DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE
|
DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE
|
||||||
else
|
else
|
||||||
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
|
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
|
||||||
|
@ -164,7 +168,7 @@ SHAREDCPPSRCS += nsSigHandlers.cpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
GARBAGE += $(SHAREDCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
|
GARBAGE += $(SHAREDCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
|
||||||
ifeq ($(OS_ARCH),WINNT)
|
ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
|
||||||
GARBAGE += $(addprefix $(srcdir)/,$(SHAREDCPPSRCS))
|
GARBAGE += $(addprefix $(srcdir)/,$(SHAREDCPPSRCS))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -790,6 +790,10 @@ typedef enum
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsXULAppInfo::GetUserCanElevate(PRBool *aUserCanElevate)
|
nsXULAppInfo::GetUserCanElevate(PRBool *aUserCanElevate)
|
||||||
{
|
{
|
||||||
|
#ifdef WINCE
|
||||||
|
*aUserCanElevate = PR_FALSE;
|
||||||
|
return NS_OK;
|
||||||
|
#else
|
||||||
HANDLE hToken;
|
HANDLE hToken;
|
||||||
|
|
||||||
VISTA_TOKEN_ELEVATION_TYPE elevationType;
|
VISTA_TOKEN_ELEVATION_TYPE elevationType;
|
||||||
|
@ -817,6 +821,7 @@ nsXULAppInfo::GetUserCanElevate(PRBool *aUserCanElevate)
|
||||||
CloseHandle(hToken);
|
CloseHandle(hToken);
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
#endif // WINCE
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -2400,7 +2405,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
|
||||||
NS_BREAK();
|
NS_BREAK();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XP_WIN32
|
#if defined (XP_WIN32) && !defined (WINCE)
|
||||||
// Suppress the "DLL Foo could not be found" dialog, such that if dependent
|
// Suppress the "DLL Foo could not be found" dialog, such that if dependent
|
||||||
// libraries (such as GDI+) are not preset, we gracefully fail to load those
|
// libraries (such as GDI+) are not preset, we gracefully fail to load those
|
||||||
// XPCOM components, instead of being ungraceful.
|
// XPCOM components, instead of being ungraceful.
|
||||||
|
|
|
@ -145,6 +145,9 @@ MakeCommandLine(int argc, PRUnichar **argv)
|
||||||
static BOOL
|
static BOOL
|
||||||
LaunchAsNormalUser(const PRUnichar *exePath, PRUnichar *cl)
|
LaunchAsNormalUser(const PRUnichar *exePath, PRUnichar *cl)
|
||||||
{
|
{
|
||||||
|
#ifdef WINCE
|
||||||
|
return PR_FALSE;
|
||||||
|
#else
|
||||||
if (!pCreateProcessWithTokenW) {
|
if (!pCreateProcessWithTokenW) {
|
||||||
// IsUserAnAdmin is not present on Win9x and not exported by name on Win2k
|
// IsUserAnAdmin is not present on Win9x and not exported by name on Win2k
|
||||||
*(FARPROC *)&pIsUserAnAdmin =
|
*(FARPROC *)&pIsUserAnAdmin =
|
||||||
|
@ -218,8 +221,8 @@ LaunchAsNormalUser(const PRUnichar *exePath, PRUnichar *cl)
|
||||||
CloseHandle(pi.hThread);
|
CloseHandle(pi.hThread);
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert UTF8 to UTF16 without using the normal XPCOM goop, which we
|
* Convert UTF8 to UTF16 without using the normal XPCOM goop, which we
|
||||||
* can't link to updater.exe.
|
* can't link to updater.exe.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче