]> OCCT Git - occt-wok.git/commitdiff
0023781: WOK doesn't correctly generate vc project files
authoribs <ibs@opencascade.com>
Thu, 21 Feb 2013 08:38:08 +0000 (12:38 +0400)
committeribs <ibs@opencascade.com>
Thu, 21 Feb 2013 08:38:08 +0000 (12:38 +0400)
in additional dependencies to each toolkit name the .lib postfix added

src/WOKTclLib/osutils.tcl

index a29212a6a1b4a7aea1f9b74b3dd49f19342cf579..0b29e98c696998840c7bf42d32d480ff97a6b33a 100755 (executable)
@@ -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] } {