summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2002-06-28 17:09:06 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2002-06-28 17:09:06 +0000
commit05fca5902af343b6f4d13abc21210bb2b19c7bb8 (patch)
tree39e23ce3756938d5d741a304307654ae6c5a8a62
parent817947cbfd85ce9fe0f31a864c777d9f76df9d22 (diff)
downloadATCD-05fca5902af343b6f4d13abc21210bb2b19c7bb8.tar.gz
Add libraries to the generated vc7 project files.
-rw-r--r--bin/MakeProjectCreator/templates/vc7.mpd5
-rw-r--r--bin/MakeProjectCreator/templates/vc7dll.mpt2
2 files changed, 6 insertions, 1 deletions
diff --git a/bin/MakeProjectCreator/templates/vc7.mpd b/bin/MakeProjectCreator/templates/vc7.mpd
index c910f48cb41..0297c862da2 100644
--- a/bin/MakeProjectCreator/templates/vc7.mpd
+++ b/bin/MakeProjectCreator/templates/vc7.mpd
@@ -39,7 +39,7 @@
AssemblerListingLocation="<%intermediate_dir%>"
ObjectFile="<%intermediate_dir%>"
<%if(pdb)%>
- ProgramDatabaseFile="<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%><%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%><%endif%><%if(type_is_static)%><%output_dir%>\<%sharedname%><%lib_modifier%><%endif%>.pdb"
+ ProgramDatabaseFile="<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%><%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%><%endif%><%if(type_is_static)%><%output_dir%>\<%staticdname%><%lib_modifier%><%endif%>.pdb"
<%endif%>
WarningLevel="<%warning_level("3")%>"
SuppressStartupBanner="TRUE"
@@ -48,6 +48,9 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:<%machine("I386")%>"
+<%if(type_is_binary)%>
+ AdditionalDependencies="<%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib<%fornotlast(" ")%><%endfor%>"
+<%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")%>"
LinkIncremental="<%incremental("0")%>"
diff --git a/bin/MakeProjectCreator/templates/vc7dll.mpt b/bin/MakeProjectCreator/templates/vc7dll.mpt
index 21c4cadfaba..05546bf2edb 100644
--- a/bin/MakeProjectCreator/templates/vc7dll.mpt
+++ b/bin/MakeProjectCreator/templates/vc7dll.mpt
@@ -6,6 +6,7 @@ ssl_libs = libeay32 ssleay32
Release {
type_is_dynamic = 1
+ type_is_binary = 1
defines = NDEBUG
output_dir = Release
intermediate_dir = Release
@@ -14,6 +15,7 @@ Release {
Debug {
type_is_dynamic = 1
+ type_is_binary = 1
optimization = 0
debug = 1
defines = _DEBUG