Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XRE build changes for windows mobile. b=420240, r=bsmedberg, a=beltzner

Browse Source
This commit is contained in:
dougt@meer.net 2008-03-05 11:23:44 -08:00
parent 19b228e5ae
commit 0069a6f866
5 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toolkit/library/Makefile.in
View File

@ -74,6 +74,10 @@ ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
CPPSRCS += dlldeps-xul.cpp
endif
ifeq ($(OS_ARCH),WINCE)
CPPSRCS += dlldeps-xul.cpp
endif
ifeq ($(OS_ARCH),OS2)
CPPSRCS += dlldeps-xul.cpp
endif
@ -228,6 +232,10 @@ ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,imagehlp)
endif
endif # WINNT
ifeq ($(OS_ARCH),WINCE)
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, aygshell cellcore uuid ole32 oleaut32 )
endif
ifdef MOZ_JPROF
EXTRA_DSO_LDOPTS += -ljprof

2
toolkit/library/libxul-rules.mk
View File

@ -74,8 +74,10 @@ DEFINES += \
$(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
ifneq ($(OS_ARCH),WINCE)
OS_LIBS += $(call EXPAND_LIBNAME,usp10)
endif
endif
ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),mac cocoa))
EXTRA_DSO_LDOPTS += -lcups
ifdef MOZ_ENABLE_GLITZ

8
toolkit/xre/Makefile.in
View File

@ -92,7 +92,7 @@ XPIDLSRCS = \
nsIXULRuntime.idl \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
XPIDLSRCS += nsIWinAppHelper.idl
endif
@ -126,7 +126,11 @@ DEFINES += -DMOZ_UPDATER
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
ifdef WINCE
CPPSRCS += nsNativeAppSupportDefault.cpp
else
CPPSRCS += nsNativeAppSupportWin.cpp
endif
DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE
else
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
@ -164,7 +168,7 @@ SHAREDCPPSRCS += nsSigHandlers.cpp
endif
GARBAGE += $(SHAREDCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
ifeq ($(OS_ARCH),WINNT)
ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
GARBAGE += $(addprefix $(srcdir)/,$(SHAREDCPPSRCS))
endif

7
toolkit/xre/nsAppRunner.cpp
View File

@ -790,6 +790,10 @@ typedef enum
NS_IMETHODIMP
nsXULAppInfo::GetUserCanElevate(PRBool *aUserCanElevate)
{
#ifdef WINCE
*aUserCanElevate = PR_FALSE;
return NS_OK;
#else
HANDLE hToken;
VISTA_TOKEN_ELEVATION_TYPE elevationType;
@ -817,6 +821,7 @@ nsXULAppInfo::GetUserCanElevate(PRBool *aUserCanElevate)
CloseHandle(hToken);
return NS_OK;
#endif // WINCE
}
#endif
@ -2400,7 +2405,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
NS_BREAK();
#endif
#ifdef XP_WIN32
#if defined (XP_WIN32) && !defined (WINCE)
// 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
// XPCOM components, instead of being ungraceful.

5
toolkit/xre/nsWindowsRestart.cpp
View File

@ -145,6 +145,9 @@ MakeCommandLine(int argc, PRUnichar **argv)
static BOOL
LaunchAsNormalUser(const PRUnichar *exePath, PRUnichar *cl)
{
#ifdef WINCE
return PR_FALSE;
#else
if (!pCreateProcessWithTokenW) {
// IsUserAnAdmin is not present on Win9x and not exported by name on Win2k
*(FARPROC *)&pIsUserAnAdmin =
@ -218,8 +221,8 @@ LaunchAsNormalUser(const PRUnichar *exePath, PRUnichar *cl)
CloseHandle(pi.hThread);
return TRUE;
#endif
}
/**
* Convert UTF8 to UTF16 without using the normal XPCOM goop, which we
* can't link to updater.exe.