Author: faridz
Date: Tue Sep 11 10:19:15 2007
New Revision: 574642
URL: http://svn.apache.org/viewvc?rev=574642&view=rev
Log:
2007-09-11 Farid Zaripov <[EMAIL PROTECTED]>
* configure.wsf (configure): Specify exactly one library
in /NODEFAULTLIB parameter of the linker.
* projectdef.js (projectCreateVCProject): The same.
Modified:
incubator/stdcxx/trunk/etc/config/windows/configure.wsf
incubator/stdcxx/trunk/etc/config/windows/projectdef.js
Modified: incubator/stdcxx/trunk/etc/config/windows/configure.wsf
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/configure.wsf?rev=574642&r1=574641&r2=574642&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/configure.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/configure.wsf Tue Sep 11 10:19:15
2007
@@ -228,10 +228,28 @@
CPPFLAGS += " /M";
+ LDFLAGS += " /NODEFAULTLIB:\"";
+
if (confInfo.dll)
+ {
CPPFLAGS += "D";
+ LDFLAGS += confInfo.debug ? "msvcprtd" : "msvcprt";
+ }
else
- CPPFLAGS += (confInfo.mt || NOSTCRT) ? "T" : "L";
+ {
+ if (confInfo.mt || NOSTCRT)
+ {
+ CPPFLAGS += "T";
+ LDFLAGS += confInfo.debug ? "libcpmtd" : "libcpmt";
+ }
+ else
+ {
+ CPPFLAGS += "L";
+ LDFLAGS += confInfo.debug ? "libcpd" : "libcp";
+ }
+ }
+
+ LDFLAGS += ".lib\"";
if (confInfo.debug)
{
@@ -248,10 +266,6 @@
CPPFLAGS += joinArray(defines, "/D");
- LDFLAGS += " /NODEFAULTLIB:libcp /NODEFAULTLIB:libcpd" +
- " /NODEFAULTLIB:libcpmt /NODEFAULTLIB:libcpmtd" +
- " /NODEFAULTLIB:msvcprt /NODEFAULTLIB:msvcprtd";
-
var exitmsg = "You may see log here: " + logFileNameURI;
// sanity check
Modified: incubator/stdcxx/trunk/etc/config/windows/projectdef.js
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/projectdef.js?rev=574642&r1=574641&r2=574642&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/projectdef.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/projectdef.js Tue Sep 11 10:19:15
2007
@@ -490,9 +490,22 @@
linker.GenerateDebugInformation = true;
if (null != this.Libs)
linker.AdditionalDependencies = this.Libs;
- linker.IgnoreDefaultLibraryNames = "libcp.lib;libcpd.lib;" +
- "libcpmt.lib;libcpmtd.lib;" +
- "msvcprt.lib;msvcprtd.lib";
+
+ if (confInfo.dll)
+ {
+ linker.IgnoreDefaultLibraryNames =
+ confInfo.debug ? "msvcprtd.lib" : "msvcprt.lib";
+ }
+ else
+ {
+ if (confInfo.mt || NOSTCRT)
+ linker.IgnoreDefaultLibraryNames =
+ confInfo.debug ? "libcpmtd.lib" : "libcpmt.lib";
+ else
+ linker.IgnoreDefaultLibraryNames =
+ confInfo.debug ? "libcpd.lib" : "libcp.lib";
+ }
+
linker.SubSystem = this.SubSystem;
if (confInfo.debug)
{
