Bug 448613 - Initialize nsToolkit correctly when libxul is enabled in a debug version; Av3a; r=benjamin sr=roc
authorBo Yang <Techrazy.Yang@gmail.com>
Sun, 07 Sep 2008 01:52:54 +0200
changeset 18911 6b64d5fe2848a961353c55d21528dde6ec90d773
parent 18910 ad53051ebd43cef1488b48175e8c88d2b5bdfb8a
child 18912 ce1afcad9243ec864316798c527d3834eea0f249
push id1818
push usersgautherie.bz@free.fr
push dateSun, 07 Sep 2008 00:06:02 +0000
treeherdermozilla-central@6b64d5fe2848 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbenjamin, roc
bugs448613
milestone1.9.1b1pre
Bug 448613 - Initialize nsToolkit correctly when libxul is enabled in a debug version; Av3a; r=benjamin sr=roc
toolkit/library/libxul-config.mk
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -36,23 +36,27 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 CPPSRCS += \
 	nsStaticXULComponents.cpp \
 	$(NULL)
 
-ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
+ifeq ($(OS_ARCH),WINNT)
 REQUIRES += libreg widget gfx
+CPPSRCS += \
+	nsDllMain.cpp \
+	$(NULL)
+endif
 
+ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
 CPPSRCS += \
 	dlldeps.cpp \
 	nsGFXDeps.cpp \
-	nsDllMain.cpp \
 	$(NULL)
 
 RCINCLUDE = xulrunner.rc
 
 ifndef MOZ_NATIVE_ZLIB
 CPPSRCS += dlldeps-zlib.cpp
 DEFINES += -DZLIB_INTERNAL
 endif