aboutsummaryrefslogtreecommitdiffstats
path: root/src/build-data/makefile
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-03-03 22:04:38 +0000
committerlloyd <[email protected]>2010-03-03 22:04:38 +0000
commit5d7adb7ab69a4aa84117a1f1b966697c914cefe7 (patch)
tree84b9443c9304392720ccab27737894f8e1e138d9 /src/build-data/makefile
parentfc5e9002d53879150e580b0249546fdee405e321 (diff)
Fix VC++ static lib builds
Diffstat (limited to 'src/build-data/makefile')
-rw-r--r--src/build-data/makefile/nmake.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index a21cc7091..212825131 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -64,7 +64,11 @@ $(CHECK): $(LIBRARIES) $(CHECKOBJS)
$(CXX) /Fe$@ $(CHECKOBJS) $(BOTAN_LIB) $(LINK_TO)
$(BOTAN_LIB): $(LIBOBJS)
+!If "$(SO_OBJ_FLAGS)" == ""
+ $(AR) /OUT:$(BOTAN_LIB) $(LIBOBJS)
+!Else
$(LIB_LINK_CMD) /Fe$(LIBNAME) $(LIBOBJS) $(LINK_TO)
+!Endif
### Fake Targets
clean: