From 020e53323bbe562dd3500ab6f1197ae21b5f4487 Mon Sep 17 00:00:00 2001
From: cascade <cascade@opencascade.com>
Date: Thu, 27 Nov 2003 11:40:28 +0000
Subject: [PATCH] some corrections in WOK for porting to STL

---
 src/WOKBuilderDef/CSF.edl   | 8 ++++----
 src/WOKBuilderDef/LDEXE.edl | 4 ++--
 src/WOKBuilderDef/LIB.edl   | 7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl
index c82c6e7..9d807e7 100755
--- a/src/WOKBuilderDef/CSF.edl
+++ b/src/WOKBuilderDef/CSF.edl
@@ -116,7 +116,7 @@
       -->> END TODO
       @set %STLPortHome = "/dn01/KAS/STLport-4.5.3";
       @if ( %STLPortHome != "") then
-        @string %STLPortInclude = "-I" %STLPortHome "/stlport";
+        @string %STLPortInclude = "-I" %STLPortHome "/stlport ";
 	@string %STLPortLib = "-L" %STLPortHome "/lib -lstlport_gcc";
       @else
         @set %STLPortInclude = "";
@@ -264,10 +264,10 @@
       --<< TODO : If applicable , modify the root location where C++ compiler is installed.
       @set %CSF_CXX_COMPILER = "D:/DevTools/VStudio/VC98/bin/cl ";
       -->> END TODO
-      @set %STLPortHome = "/dn01/KAS/STLport-4.5.3";
+      @set %STLPortHome = "F:/KAS/BAG/STLport-4.5.3";
       @if ( %STLPortHome != "") then
-        @string %STLPortInclude = "-I" %STLPortHome "/stlport";
-	@string %STLPortLib = "-L" %STLPortHome "/lib/stlport_vc6.lib";
+        @string %STLPortInclude = "-I" %STLPortHome "/stlport ";
+	@string %STLPortLib = %STLPortHome "/lib/stlport_vc6.lib";
       @else
         @set %STLPortInclude = "";
 	@set %STLPortLib = "";
diff --git a/src/WOKBuilderDef/LDEXE.edl b/src/WOKBuilderDef/LDEXE.edl
index c29298f..3185fe2 100755
--- a/src/WOKBuilderDef/LDEXE.edl
+++ b/src/WOKBuilderDef/LDEXE.edl
@@ -78,8 +78,8 @@
  @endif;
 
  @if( %Station == "lin" ) then
-  @template LDEXE_Header ( %Target ) is
-   $/usr/bin/g++ -o %Target \
+  @template LDEXE_Header ( %Target , %STLPortLib ) is
+   $/usr/bin/g++ -o %Target %STLPortLib \
   @end;
  @endif;
 
diff --git a/src/WOKBuilderDef/LIB.edl b/src/WOKBuilderDef/LIB.edl
index 51ba4cc..4179c0b 100755
--- a/src/WOKBuilderDef/LIB.edl
+++ b/src/WOKBuilderDef/LIB.edl
@@ -4,7 +4,6 @@
 -- Copyright	:	MATRA Datavision
 -- Purpose	:	Defines tools for library management
 --			( Microsoft Visual C/C++ V4.1 )
-
 @ifnotdefined ( %LIB_EDL ) then
  @set %LIB_EDL = "";
 
@@ -48,9 +47,9 @@
                          %CSF_LibraryHeaderOpt ,
                          --%LibraryHeaderLib ,
                          --%LibraryHeaderOpt ,
-                         %LibraryDEFile ) is
-	--$%LibraryHeaderLib %LibraryHeaderOpt -def:%LibraryDEFile \^
-	$%CSF_LibraryHeaderLib %CSF_LibraryHeaderOpt -def:%LibraryDEFile \^
+                         %LibraryDEFile ,
+			 %STLPortHome ) is
+	$%CSF_LibraryHeaderLib %CSF_LibraryHeaderOpt -def:%LibraryDEFile -libpath:%STLPortHome/lib \^
  @end;
 
  @template LIB_LibrarySTATLIB ( %CollectorOutput ) is
-- 
2.39.5