From 101b4e2a075bd5a7d682cd66c75ccb4e6b78b672 Mon Sep 17 00:00:00 2001 From: "bryner%brianryner.com" Date: Thu, 20 Nov 2003 23:18:30 +0000 Subject: [PATCH] Fix windows static build bustage (bug 226264), r=bsmedberg. git-svn-id: svn://10.0.0.236/trunk@149592 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/tests/mfcembed/Makefile.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mozilla/embedding/tests/mfcembed/Makefile.in b/mozilla/embedding/tests/mfcembed/Makefile.in index 4179798a01c..1849e50e0cb 100644 --- a/mozilla/embedding/tests/mfcembed/Makefile.in +++ b/mozilla/embedding/tests/mfcembed/Makefile.in @@ -41,7 +41,9 @@ MODULE = mfcEmbed # comment this out if for some reason you want to link against xpcom # directly instead of using the standalone glue +ifndef BUILD_STATIC_LIBS GRE_BUILD = 1 +endif ifdef GRE_BUILD DEFINES += -DXPCOM_GLUE @@ -115,7 +117,6 @@ endif LIBS = \ $(EXTRA_DSO_LIBS) \ $(MOZ_UNICHARUTIL_LIBS) \ - $(NSPR_LIBS) \ $(NULL) ifdef GRE_BUILD @@ -127,7 +128,12 @@ LIBS += \ $(NULL) else LIBS += $(XPCOM_LIBS) +ifdef BUILD_STATIC_LIBS +LIBS += $(MOZ_JS_LIBS) endif +endif + +LIBS += $(NSPR_LIBS) OS_LIBS += \ ole32.lib \