some corrections in WOK for porting to STL

diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl
index c82c6e73ecb8db093cdef2e84f6f2ed8121e863d..9d807e706fa761b2ebc39439b7f77b903b3fbff7 100755 (executable)
--- 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 c29298fbbee6cc5c316a4cf9c243538aa4d7487a..3185fe29013e9137b06a93e5ef08256da3f345d8 100755 (executable)
--- 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 51ba4cc41c7df1381f8d0ae7143cafc8af892fdb..4179c0bd0588bb0b2636bc3647a34926af318424 100755 (executable)
--- 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