Browse Source

ERR: Fixed library path problem for ReleaseMinSize build. should now be used in place of separate Release, Debug, and ReleaseMinSize.

Brad King 24 years ago
parent
commit
772b1f6278
3 changed files with 4 additions and 14 deletions
  1. 1 6
      Source/cmDSPMakefile.cxx
  2. 1 6
      Source/cmDSPWriter.cxx
  3. 2 2
      Source/staticLibHeader.dsptemplate

+ 1 - 6
Source/cmDSPMakefile.cxx

@@ -74,21 +74,16 @@ void cmDSPMakefile::OutputDSPFile()
       {
       if(i->find("Release") == std::string::npos)
 	{
-	m_DebugLibraryOptions += "/Debug\" ";
+	m_DebugLibraryOptions += "/$(OUTDIR)\" ";
 	}
       }
     }
   m_DebugLibraryOptions += "/STACK:10000000 ";
   // add any extra define flags 
   m_ReleaseLibraryOptions = m_DebugLibraryOptions;
-  cmSystemTools::ReplaceString(m_ReleaseLibraryOptions, "Debug", "Release");
   m_DebugDLLLibraryOptions = m_DebugLibraryOptions;
-  cmSystemTools::ReplaceString(m_DebugDLLLibraryOptions, "Debug", "DebugDLL");
   m_ReleaseDLLLibraryOptions = m_DebugDLLLibraryOptions;
-  cmSystemTools::ReplaceString(m_ReleaseDLLLibraryOptions, "Debug", "Release");
   m_ReleaseMinSizeLibraryOptions = m_ReleaseLibraryOptions;
-  cmSystemTools::ReplaceString(m_ReleaseMinSizeLibraryOptions, 
-                               "Release", "ReleaseMinSize");
   
   // Create the DSP or set of DSP's for libraries and executables
   if(strlen(m_Makefile->GetLibraryName()) != 0)

+ 1 - 6
Source/cmDSPWriter.cxx

@@ -74,21 +74,16 @@ void cmDSPMakefile::OutputDSPFile()
       {
       if(i->find("Release") == std::string::npos)
 	{
-	m_DebugLibraryOptions += "/Debug\" ";
+	m_DebugLibraryOptions += "/$(OUTDIR)\" ";
 	}
       }
     }
   m_DebugLibraryOptions += "/STACK:10000000 ";
   // add any extra define flags 
   m_ReleaseLibraryOptions = m_DebugLibraryOptions;
-  cmSystemTools::ReplaceString(m_ReleaseLibraryOptions, "Debug", "Release");
   m_DebugDLLLibraryOptions = m_DebugLibraryOptions;
-  cmSystemTools::ReplaceString(m_DebugDLLLibraryOptions, "Debug", "DebugDLL");
   m_ReleaseDLLLibraryOptions = m_DebugDLLLibraryOptions;
-  cmSystemTools::ReplaceString(m_ReleaseDLLLibraryOptions, "Debug", "Release");
   m_ReleaseMinSizeLibraryOptions = m_ReleaseLibraryOptions;
-  cmSystemTools::ReplaceString(m_ReleaseMinSizeLibraryOptions, 
-                               "Release", "ReleaseMinSize");
   
   // Create the DSP or set of DSP's for libraries and executables
   if(strlen(m_Makefile->GetLibraryName()) != 0)

+ 2 - 2
Source/staticLibHeader.dsptemplate

@@ -97,8 +97,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "ReleaseMinSize"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /FD /c
-# ADD CPP /nologo /GR /GX /Zm1000 /MT /W3 /O1 BUILD_INCLUDES EXTRA_DEFINES /D "NDEBUG" /D "_MBCS" /D "_ATL_DLL"  /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /FD /c
+# ADD CPP /nologo /GR /GX /Zm1000 /MD /W3 /O1 BUILD_INCLUDES EXTRA_DEFINES /D "NDEBUG" /D "_MBCS" /D "_ATL_DLL"  /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"