summaryrefslogtreecommitdiff
path: root/solenv/gbuild/platform/WNT_INTEL_MSC.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-02-09 22:31:30 +0200
committerTor Lillqvist <tml@iki.fi>2012-02-13 17:53:36 +0200
commit25f8330004409edf8007df0cc80ef540c03d18da (patch)
treecd57dc9c10abd268628a226f2cbaaf8479266a9c /solenv/gbuild/platform/WNT_INTEL_MSC.mk
parenta092057d2b8ff8abd1172b4163979ecf799d5888 (diff)
Add fw* and sfx to libmerged
Diffstat (limited to 'solenv/gbuild/platform/WNT_INTEL_MSC.mk')
-rw-r--r--solenv/gbuild/platform/WNT_INTEL_MSC.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index c10684590991..d542017b4092 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -191,6 +191,11 @@ gb_CFLAGS_WERROR := -WX -DLIBO_WERROR
gb_CXXFLAGS_WERROR := -WX -DLIBO_WERROR
endif
+ifeq ($(MERGELIBS),TRUE)
+gb_CFLAGS += -DLIBO_MERGELIBS
+gb_CXXFLAGS += -DLIBO_MERGELIBS
+endif
+
gb_LinkTarget_EXCEPTIONFLAGS := \
-DEXCEPTIONS_ON \
-EHa \