Bug OCC4062 The filling of development version of WOK doesn't equivalent to release...

diff --git a/src/WOKBuilderDef/CMPLRS.edl b/src/WOKBuilderDef/CMPLRS.edl
index 876b108b1a6ecac0fb579f0f1a629b76d86a0c0b..e3599d02292dc2628967d1656763553b04993087 100755 (executable)
--- a/src/WOKBuilderDef/CMPLRS.edl
+++ b/src/WOKBuilderDef/CMPLRS.edl
@@ -419,7 +419,7 @@
                                              %BaseName, 
                                              %OutputDir ,
                                               %TmpFile , %Entity ) is
-      $cd %OutputDir &&  $%CMPLRS_C_COMPILER %CMPLRS_C_SysOptions %CMPLRS_C_Options %CMPLRS_C_ModeOpt %CMPLRS_C_INCLUDE %CMPLRS_CXX_DBMSOpt  %IncDirectives %CMPLRS_Unit_C_Options %CMPLRS_C_WOKDirectives -c %Source -o %OutputDir/%BaseName.o 
+      $cd %OutputDir &&  %CMPLRS_C_COMPILER %CMPLRS_C_SysOptions %CMPLRS_C_Options %CMPLRS_C_ModeOpt %CMPLRS_C_INCLUDE %CMPLRS_CXX_DBMSOpt  %IncDirectives %CMPLRS_Unit_C_Options %CMPLRS_C_WOKDirectives -c %Source -o %OutputDir/%BaseName.o 
       $set stat = $status
       $echo '$C_COMPILER  %CMPLRS_C_SysOptions %CMPLRS_C_Options $INCDIRS %CMPLRS_C_ModeOpt %CMPLRS_C_INCLUDE %CMPLRS_CXX_DBMSOpt %CMPLRS_Unit_C_Options %CMPLRS_C_WOKDirectives -c $SOURCE -o $OBJECT' > %OutputDir/../%Entity/.adm/c.compile
       $if ( $stat == 0 ) then
@@ -464,7 +464,7 @@
                                                %BaseName,
                                                 %OutputDir ,
                                                 %TmpFile , %Entity ) is
-      $cd %OutputDir && $%CMPLRS_CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options %CMPLRS_CXX_INCLUDE %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt %IncDirectives %DBDirectives %CMPLRS_CXX_WOKDirectives -c %Source -o %OutputDir/%BaseName.o  >& %TmpFile
+      $cd %OutputDir && %CMPLRS_CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options %CMPLRS_CXX_INCLUDE %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt %IncDirectives %DBDirectives %CMPLRS_CXX_WOKDirectives -c %Source -o %OutputDir/%BaseName.o  >& %TmpFile
       $set stat = $status
       
       $if ( $stat == 0 ) then

diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl
index 9d807e706fa761b2ebc39439b7f77b903b3fbff7..7de56129f8433bfa506dd5a4070781aa200dca9e 100755 (executable)
--- a/src/WOKBuilderDef/CSF.edl
+++ b/src/WOKBuilderDef/CSF.edl
@@ -114,7 +114,7 @@
       --<< TODO : If applicable , modify the location of the C++ compiler. 
       @set %CSF_CXX_COMPILER = "/usr/bin/g++ ";
       -->> END TODO
-      @set %STLPortHome = "/dn01/KAS/STLport-4.5.3";
+      @set %STLPortHome = "";
       @if ( %STLPortHome != "") then
         @string %STLPortInclude = "-I" %STLPortHome "/stlport ";
        @string %STLPortLib = "-L" %STLPortHome "/lib -lstlport_gcc";
@@ -170,7 +170,7 @@
 
       @string %CSF_XwLibs = "-L" %X11_LIB " -lX11 -lXext -lXmu -lXi -ldps";
 
-      @string %CSF_OpenGlLibs = "-L" %X11_LIB " -lGLU -lGL -lglut -dps" ;
+      @string %CSF_OpenGlLibs = "-L" %X11_LIB " -lGLU -lGL -dps" ;
 
       @string %CSF_TclLibs = "-L" %CSF_TCL_HOME "/lib  -ltcl "; 
       @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib  -ltk -L" %X11_LIB " -lX11";
@@ -264,7 +264,7 @@
       --<< 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 = "F:/KAS/BAG/STLport-4.5.3";
+      @set %STLPortHome = "";
       @if ( %STLPortHome != "") then
         @string %STLPortInclude = "-I" %STLPortHome "/stlport ";
        @string %STLPortLib = %STLPortHome "/lib/stlport_vc6.lib";
@@ -314,6 +314,7 @@
       @set %CSF_TCL_HOME = "D:/DevTools/TclTk";
       @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
       @string %CSF_TclLibs = %CSF_TCL_HOME "/lib/tcl76i.lib";
+      @string %CSF_TclTkLibs = %CSF_TCL_HOME "/lib/tcl42i.lib";
 
       @set %CSF_OpenGlLibs = "opengl32.lib glu32.lib" ;
 
@@ -396,7 +397,7 @@
       @set %CSF_FPELibs = "-L/usr/lib32 -lfpe" ;
 
       @set %CSF_TCL_HOME = "/usr/tcltk.64";
-      @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
+      @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include/itcl ";
 
       @set %CSF_X11_INCLUDE_EXTENSION = " -I/usr/include/X11/extensions ";
 
@@ -414,8 +415,8 @@
       @string %CSF_XwLibs  = "-L" %X11_LIB " -lX11 -lXext -lXmu";
       @string %CSF_OpenGlLibs = "-L" %X11_LIB " -lGLU -lGL " ;
 
-      @string %CSF_TclLibs   = "-L" %CSF_TCL_HOME "/lib -rpath " %CSF_TCL_HOME "/lib -ltcl"; 
-      @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib -rpath " %CSF_TCL_HOME "/lib -ltk"; 
+      @string %CSF_TclLibs   = "-L" %CSF_TCL_HOME "/lib/itcl -rpath " %CSF_TCL_HOME "/lib/itcl -ltcl"; 
+      @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib/itcl -rpath " %CSF_TCL_HOME "/lib/itcl -ltk"; 
    @endif;
 
    --