restore -DCSFDB option in DFLT mode, cration a really Optimize Mode for WNT, correcti...

diff --git a/src/WOKBuilderDef/CMPLRS.edl b/src/WOKBuilderDef/CMPLRS.edl
index 62e46acb0c2a05ea7e2d0a5281d2f7b935abb692..30b36fd6b14857e3d958170caffd0d9bf4d141f2 100755 (executable)
--- a/src/WOKBuilderDef/CMPLRS.edl
+++ b/src/WOKBuilderDef/CMPLRS.edl
@@ -428,6 +428,7 @@
                                              %BaseName, 
                                              %OutputDir ,
                                               %TmpFile , %Entity ) is
+     $%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
@@ -477,16 +478,17 @@
                                                %BaseName,
                                                 %OutputDir ,
                                                 %TmpFile , %Entity ) is
-     $cd %OutputDir
-     $%CMPLRS_CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options %CMPLRS_CXX_INCLUDE %CMPLRS_CXX_JAVA %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt %IncDirectives %DBDirectives %CMPLRS_CXX_WOKDirectives -c %Source -o %OutputDir/%BaseName.o  >& %TmpFile
+     $%CMPLRS_CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options %CMPLRS_CXX_INCLUDE %CMPLRS_CXX_JAVA %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt %IncDirectives %DBDirectives %CMPLRS_CXX_WOKDirectives -c %Source -o %OutputDir/%BaseName.o 
+     $cd %OutputDir 
+     $%CMPLRS_CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options %CMPLRS_CXX_INCLUDE %CMPLRS_CXX_JAVA %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
       $  if ( -e %OutputDir/%BaseName.d ) then
       $    sed -e '/:/d' -e 's/\\/ /g'  %OutputDir/%BaseName.d | tr ' ' '\012' | sort -u > %OutputDir/%BaseName.m
       $  endif
       $endif
---      $if( -e %TmpFile ) grep ':' %TmpFile
---      $/bin/rm -f %TmpFile
+      $if( -e %TmpFile ) grep ':' %TmpFile
+      $/bin/rm -f %TmpFile
       $set status = $stat
     
     @end;
@@ -676,12 +678,16 @@
     @end;
 
     @if ( %DebugMode == "True" ) then
-       @set %CMPLRS_CXX_ModeOpt = "-DDEB -D_DEBUG";
-       @set %CMPLRS_C_ModeOpt   = "-DDEB -D_DEBUG";
+       @set %CMPLRS_CXX_ModeOpt = "-D_DEBUG ";
+       @set %CMPLRS_C_ModeOpt   = "-D_DEBUG ";
+       @set %CMPLRS_CXX_SysOptions = "-nologo -MDd -W3 -Gm -GX -Od -Zi";
+       @set %CMPLRS_C_SysOptions = "-nologo -MDd -W3 -Gm -GX -Od -Zi";
        @set %CMPLRS_F77_ModeOpt = "-DDEB -D_DEBUG";
     @else
-       @set %CMPLRS_CXX_ModeOpt = "-DNDEBUG -DNo_Exception";
-       @set %CMPLRS_C_ModeOpt   = "-DNDEBUG -DNo_Exception";
+       @set %CMPLRS_CXX_ModeOpt = "-DNDEBUG -DNo_Exception ";
+       @set %CMPLRS_C_ModeOpt   = "-DNDEBUG -DNo_Exception ";
+       @set %CMPLRS_CXX_SysOptions = "-nologo -MD -W3 -GX -O2 ";
+       @set %CMPLRS_C_SysOptions = "-nologo -MD -W3 -GX -O2 ";
        @set %CMPLRS_F77_ModeOpt = "-DNDEBUG -DNo_Exception";
     @endif;
 
@@ -692,6 +698,9 @@
     @if ( %DBMS == "OBJS" ) then
        @set %CMPLRS_CXX_DBMSOpt = "-DOBJS";
     @endif;
+    @if ( %DBMS == "DFLT" ) then
+       @set %CMPLRS_CXX_DBMSOpt = "-DCSFDB";
+    @endif;
 
     @template CMPLRS_C_Footer (
                                         %CMPLRS_C_Options,
@@ -752,25 +761,16 @@
     $%IncDirectives
     @end;
 
-
-
-  @template CMPLRS_CXX_CmdLine ( %CMPLRS_CXX_COMPILER, 
-                                %CMPLRS_CXX_SysOptions, 
-                                %CMPLRS_CXX_Options, 
-                                %CMPLRS_CXX_ModeOpt,
-                                %CMPLRS_CXX_JAVA ,     
-                                %IncDirectives, 
-                                %PDBName, 
-                                %Source,
-                                %BaseName, 
-                                %OutputDir, 
-                                %CMPLRS_ExportBehaviour
+  @template CMPLRS_CXX_CmdLine (
+             %CMPLRS_CXX_COMPILER, %CMPLRS_CXX_SysOptions, %CMPLRS_CXX_Options, %CMPLRS_CXX_ModeOpt,
+             %CMPLRS_CXX_JAVA, %CMPLRS_CXX_DBMSOpt, %IncDirectives, %CMPLRS_CXX_INCLUDE, %PDBName, %Source,
+             %BaseName, %OutputDir, %CMPLRS_ExportBehaviour
             ) is
   $%CMPLRS_CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options %CMPLRS_ExportBehaviour\^
-  $  %IncDirectives %CMPLRS_CXX_ModeOpt %CMPLRS_CXX_JAVA \^
+  $  %IncDirectives %CMPLRS_CXX_INCLUDE %CMPLRS_CXX_ModeOpt %CMPLRS_CXX_JAVA %CMPLRS_CXX_DBMSOpt\^
   $ -Fd%PDBName -c -Tp %Source -Fo%OutputDir%BaseName.obj;
   $set cmplrs_status=%status%;
-  $@acpp.exe -M -m -+ %CMPLRS_CXX_Options -D__cplusplus -D_DLL -D_MT %CMPLRS_ExportBehaviour %IncDirectives\^
+  $@acpp.exe -M -m -+ %CMPLRS_CXX_Options -D__cplusplus -D_DLL  -D_MT %CMPLRS_ExportBehaviour  %IncDirectives %CMPLRS_CXX_INCLUDE\^
   $ %Source -o %OutputDir%BaseName.m;
   $set status=%cmplrs_status%;
   @end;

diff --git a/src/WOKBuilderDef/LINK.edl b/src/WOKBuilderDef/LINK.edl
index 7d39a93fb30bfcc1809207e15a0e532f59388105..21ab9acd7c4185c240b25aba4ad3943b472d3612 100755 (executable)
--- a/src/WOKBuilderDef/LINK.edl
+++ b/src/WOKBuilderDef/LINK.edl
@@ -7,6 +7,7 @@
 
 @ifnotdefined ( %LINK_EDL ) then
 -- @set %LINK_EDL = ""--; Syntax error
+ @cout "LINK";
 
  @uses "CSF.edl";
 
@@ -26,10 +27,22 @@
  @set %LINKModeOpt  = "-debug";
 
 -- Set %LINK_NoDefStub if you do not want to link with stub objects
- @set %LINK_NoDefStub = " ";
-
-
- @set %LINK_LinkerPDBOption = " -pdb:";
+ @set %LINK_NoDefStub = "1 ";
+
+ @if ( %DebugMode == "True" ) then
+       @set %LinkModeOpt = "-debug ";
+       @set %LINK_LinkerPDBOption = " -pdb:";
+       @template LINK_LinkerPDB ( %CollectorOutput ) is
+               $%CollectorOutput.pdb\^
+       @end;
+ @else
+       @set %LinkModeOpt = " ";
+       @set %LINK_LinkerPDBOption = " ";
+       @template LINK_LinkerPDB ( %CollectorOutput ) is
+               $ \^
+       @end;
+
+ @endif;
  
 
  @template LINK_LinkerIMP ( %CollectorOutput ) is
@@ -44,24 +57,20 @@
        $%CollectorOutput.dll\^
  @end;
 
- @template LINK_LinkerPDB ( %CollectorOutput ) is
-       $%CollectorOutput.pdb\^
- @end;
-
  @template LINK_LinkerEXE ( %CollectorOutput ) is
        $%CollectorOutput.exe\^
  @end;
 
  @template LINK_LinkerHeaderDLL ( %CSF_LINKER ,
-                                  %Station,
-                                  %LINKModeOpt ) is
+                                               %Station,
+                                               %LINKModeOpt ) is
        $%CSF_LINKER -nologo -subsystem:windows -dll -incremental:no -machine:IX86 %LINKModeOpt \^
  @end;
 
  @template LINK_LinkerHeaderEXE ( %CSF_LINKER ,
-                                  %Station,
-                                  %LINKModeOpt,
-                                  %LinkSubsystem ) is
+                                               %Station,
+                                               %LINKModeOpt,
+                                               %LinkSubsystem ) is
        $%CSF_LINKER -nologo -subsystem:%LinkSubsystem -incremental:no -machine:IX86 %LINKModeOpt \^
  @end;