From 7008bc5e3685da83ba48973ba73056948ea8168e Mon Sep 17 00:00:00 2001
From: inv <inv@opencascade.com>
Date: Tue, 14 Sep 2010 07:20:14 +0000
Subject: [PATCH] Update for correct generation of VC projects if CSF variable
 contains more then one library

---
 src/WOKTclLib/osutils.tcl | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl
index 23113ed..ec2ed1c 100755
--- a/src/WOKTclLib/osutils.tcl
+++ b/src/WOKTclLib/osutils.tcl
@@ -848,13 +848,15 @@ proc osutils:vcproj { vc plat dir tkloc _guids {tmplat {} } {fmtcpp {} } } {
     foreach tk [lappend [wokUtils:LIST:Purge [osutils:tk:close [woklocate -u $tkloc]]] $tkloc] {
 	foreach element [osutils:tk:hascsf [woklocate -p ${tk}:source:EXTERNLIB [wokcd]]] {
 	    if {[wokparam -t %$element] != 0} {
-		set felem [file tail [lindex [wokparam -v "%$element"] 0]]
-	      if {[lsearch $tkused $felem] == "-1"} {
-		if {$felem != "\{\}"} {
-		    set tkused [concat $tkused $felem]
-		}
-	     }   
-	   }
+		foreach fl [split [wokparam -v %$element] \{\ \}] {
+		    set felem [file tail $fl]
+		    if {[lsearch $tkused $felem] == "-1"} {
+			if {$felem != "\{\}"} {
+			    set tkused [concat $tkused $felem]
+			}
+		    }
+		}   
+	    }
 	}
     }
 
@@ -969,15 +971,16 @@ proc osutils:vcprojx { vc plat dir tkloc _guids {tmplat0 {} } {fmtcpp {} } } {
 	  foreach element [osutils:tk:hascsf [woklocate -p ${tk}:source:EXTERNLIB [wokcd]]]  {
 	    if {[wokparam -t %$element] != 0} {
                 set elemlist [wokparam -v "%$element"]
-		set felem [file tail [lindex $elemlist 0]] 
-	      if {[lsearch $tkused $felem] == "-1"} {
-		if {$felem != "\{\}"} {
-                    #puts "was found $element $felem"	   
-		    set tkused [concat $tkused $felem]
+		foreach fl [split [wokparam -v %$element] \{\ \}] {
+		set felem [file tail $fl] 
+		    if {[lsearch $tkused $felem] == "-1"} {
+			if {$felem != "\{\}"} {
+			    #puts "was found $element $felem"	   
+			    set tkused [concat $tkused $felem]
+			}
+		    }   
 		}
-	      }   
 	    }
-	 }
 	}
 	set WOKSteps_exec_link [wokparam -v %WOKSteps_exec_link [woklocate -u $tkloc]]
 	if { [regexp {WOKStep_DLLink} $WOKSteps_exec_link] || [regexp {WOKStep_Libink} $WOKSteps_exec_link] } { 
-- 
2.39.5