From a74e6dbc41ed1a1702f8859ccfd55de820324fe5 Mon Sep 17 00:00:00 2001 From: ibs Date: Thu, 21 Feb 2013 12:38:08 +0400 Subject: [PATCH] 0023781: WOK doesn't correctly generate vc project files in additional dependencies to each toolkit name the .lib postfix added --- src/WOKTclLib/osutils.tcl | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl index a29212a..0b29e98 100755 --- a/src/WOKTclLib/osutils.tcl +++ b/src/WOKTclLib/osutils.tcl @@ -863,7 +863,12 @@ proc osutils:vcproj { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} } regsub -all -- {__PROJECT_GUID__} $theProjTmpl $aGuidsMap($theToolKit) theProjTmpl - set aUsedToolKits [concat [osutils:commonUsedTK $theToolKit] [osutils:usedOsLibs $theToolKit "wnt"]] + set aCommonUsedTK [list] + foreach tkx [osutils:commonUsedTK $theToolKit] { + lappend aCommonUsedTK "${tkx}.lib" + } + + set aUsedToolKits [concat $aCommonUsedTK [osutils:usedOsLibs $theToolKit "wnt"]] # correct names of referred third-party libraries that are named with suffix # depending on VC version @@ -978,8 +983,13 @@ proc osutils:vcprojx { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} set aGuidsMap($aProjName) [OS:genGUID] } regsub -all -- {__PROJECT_GUID__} $aProjTmpl $aGuidsMap($aProjName) aProjTmpl - - set aUsedToolKits [concat [osutils:commonUsedTK $theToolKit] [osutils:usedOsLibs $theToolKit "wnt"]] + + set aCommonUsedTK [list] + foreach tkx [osutils:commonUsedTK $theToolKit] { + lappend aCommonUsedTK "${tkx}.lib" + } + + set aUsedToolKits [concat $aCommonUsedTK [osutils:usedOsLibs $theToolKit "wnt"]] set WOKSteps_exec_link [wokparam -v %WOKSteps_exec_link [woklocate -u $theToolKit]] if { [regexp {WOKStep_DLLink} $WOKSteps_exec_link] || [regexp {WOKStep_Libink} $WOKSteps_exec_link] } { -- 2.39.5