b=465662; don't build libreg on Windows CE; r=bsmedberg
authorVladimir Vukicevic <vladimir@pobox.com>
Tue, 24 Mar 2009 18:45:21 -0700
changeset 26578 4b357b32c13266f7832710e860810565583fd219
parent 26577 f2ace497dea622417efdf4711f4313cec216d84f
child 26579 c186c49f2259aa429cf57ba0c74ba5a384ebe113
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs465662
milestone1.9.2a1pre
b=465662; don't build libreg on Windows CE; r=bsmedberg
netwerk/build.mk
toolkit/library/libxul-config.mk
--- a/netwerk/build.mk
+++ b/netwerk/build.mk
@@ -60,19 +60,21 @@ endif
 
 # the offline cache uses mozStorage
 ifdef MOZ_STORAGE
 tier_necko_dirs += storage/public
 endif
 
 # these are only in the necko tier because libpref needs it
 
+ifndef WINCE
 ifneq (1_,$(MOZ_NO_XPCOM_OBSOLETE)_$(MOZ_XPINSTALL))
 tier_necko_dirs += modules/libreg
 endif
+endif
 
 ifndef MOZ_NO_XPCOM_OBSOLETE
 tier_necko_dirs += xpcom/obsolete
 endif
 
 tier_necko_dirs += \
 		modules/libpref \
 		intl \
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -37,17 +37,17 @@
 #
 # ***** END LICENSE BLOCK *****
 
 CPPSRCS += \
 	nsStaticXULComponents.cpp \
 	$(NULL)
 
 ifeq (,$(filter-out WINCE WINNT,$(OS_ARCH)))
-REQUIRES += libreg widget gfx
+REQUIRES += widget gfx
 CPPSRCS += \
 	nsDllMain.cpp \
 	$(NULL)
 endif
 
 ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
 CPPSRCS += \
 	dlldeps.cpp \
@@ -60,21 +60,22 @@ ifndef MOZ_NATIVE_ZLIB
 CPPSRCS += dlldeps-zlib.cpp
 DEFINES += -DZLIB_INTERNAL
 endif
 
 LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/windows
 endif
 
 ifneq (,$(filter WINNT OS2,$(OS_ARCH)))
+REQUIRES += libreg
 DEFINES	+= -DZLIB_DLL=1
 endif
 
 ifeq ($(OS_ARCH),OS2)
-REQUIRES += libreg widget gfx
+REQUIRES += widget gfx
 
 CPPSRCS += \
 	dlldeps.cpp \
 	nsGFXDeps.cpp \
 	$(NULL)
 
 ifndef MOZ_NATIVE_ZLIB
 CPPSRCS += dlldeps-zlib.cpp
@@ -93,21 +94,23 @@ endif
 STATIC_LIBS += \
 	xpcom_core \
 	ucvutil_s \
 	gkgfx \
 	gfxshared_s \
 	$(NULL)
 
 #ifndef MOZ_EMBEDDING_LEVEL_DEFAULT
+ifndef WINCE
 ifdef MOZ_XPINSTALL
 STATIC_LIBS += \
 	mozreg_s \
 	$(NULL)
 endif
+endif
 #endif
 
 # component libraries
 COMPONENT_LIBS += \
 	xpconnect \
 	necko \
 	uconv \
 	i18n \