summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-02-12 16:19:35 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-02-12 16:19:35 +0000
commit5aca69a916a89c1b4f1acf36ff3fb9815a041f57 (patch)
tree689cf65a51f127f5314e5a65ac777d1aea988e6d
parent341070cee0500225034bc63f1c6865908a36bf02 (diff)
downloadATCD-5aca69a916a89c1b4f1acf36ff3fb9815a041f57.tar.gz
ChangeLogTag:Wed Feb 12 10:18:21 2003 Nanbor Wang <nanbor@cs.wustl.edu>
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLogs/ChangeLog-03a5
-rw-r--r--bin/MakeProjectCreator/templates/vc7.mpd2
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d2f509f1a1e..74572638d79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 12 10:18:21 2003 Nanbor Wang <nanbor@cs.wustl.edu>
+
+ * bin/MakeProjectCreator/templates/vc7.mpd: Checked in Chad's
+ missing ssl_libs fix.
+
Wed Feb 12 08:59:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/UPIPE_Addr.h:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index d2f509f1a1e..74572638d79 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,8 @@
+Wed Feb 12 10:18:21 2003 Nanbor Wang <nanbor@cs.wustl.edu>
+
+ * bin/MakeProjectCreator/templates/vc7.mpd: Checked in Chad's
+ missing ssl_libs fix.
+
Wed Feb 12 08:59:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/UPIPE_Addr.h:
diff --git a/bin/MakeProjectCreator/templates/vc7.mpd b/bin/MakeProjectCreator/templates/vc7.mpd
index 6f3a94535eb..86658045e27 100644
--- a/bin/MakeProjectCreator/templates/vc7.mpd
+++ b/bin/MakeProjectCreator/templates/vc7.mpd
@@ -57,7 +57,7 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:<%machine("I386")%>"
<%if(type_is_binary)%>
- AdditionalDependencies="<%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib<%fornotlast(" ")%><%endfor%>"
+ AdditionalDependencies="<%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib<%fornotlast(" ")%><%endfor%><%if(ssl)%><%foreach(ssl_libs)%> <%ssl_lib%>.lib<%endfor%><%endif%>"
<%endif%>
OutputFile="<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%>\<%endif%><%exename%>.exe<%endif%><%if(type_is_static)%><%libout%>\<%staticname%><%lib_modifier%>.lib<%endif%>"
Version="<%version("1.0")%>"