From: cascade Date: Fri, 29 Sep 2006 18:14:02 +0000 (+0000) Subject: Update for OCCT 6.1.1 X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=c190960c710b763d725a1fd8e1a4f23be9a8788a;p=occt-wok.git Update for OCCT 6.1.1 --- diff --git a/src/WOKBuilderDef/CMPLRS.edl b/src/WOKBuilderDef/CMPLRS.edl index e3599d0..2a32830 100755 --- a/src/WOKBuilderDef/CMPLRS.edl +++ b/src/WOKBuilderDef/CMPLRS.edl @@ -353,13 +353,21 @@ @end; @if ( %DebugMode == "True" ) then - @set %CMPLRS_CXX_ModeOpt = "-g -O0 -DDEB -D_DEBUG"; - @set %CMPLRS_C_ModeOpt = "-g -O0 -DDEB -D_DEBUG"; - @set %CMPLRS_F77_ModeOpt = "-g -DDEB -D_DEBUG"; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb +-- @set %CMPLRS_CXX_ModeOpt = "-g -O0 -DDEB -D_DEBUG"; +-- @set %CMPLRS_C_ModeOpt = "-g -O0 -DDEB -D_DEBUG"; +-- @set %CMPLRS_F77_ModeOpt = "-g -DDEB -D_DEBUG"; + @set %CMPLRS_CXX_ModeOpt = %CSF_CXX_ModeOptDeb ; + @set %CMPLRS_C_ModeOpt = %CSF_C_ModeOptDeb ; + @set %CMPLRS_F77_ModeOpt = %CSF_F77_ModeOptDeb ; @else - @set %CMPLRS_CXX_ModeOpt = "-O3 -DNDEBUG -DNo_Exception"; - @set %CMPLRS_C_ModeOpt = "-O3 -DNDEBUG -DNo_Exception"; - @set %CMPLRS_F77_ModeOpt = "-O3 -DNDEBUG -DNo_Exception"; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb +-- @set %CMPLRS_CXX_ModeOpt = "-O3 -DNDEBUG -DNo_Exception"; +-- @set %CMPLRS_C_ModeOpt = "-O3 -DNDEBUG -DNo_Exception"; +-- @set %CMPLRS_F77_ModeOpt = "-O3 -DNDEBUG -DNo_Exception"; + @set %CMPLRS_CXX_ModeOpt = %CSF_CXX_ModeOpt ; + @set %CMPLRS_C_ModeOpt = %CSF_C_ModeOpt ; + @set %CMPLRS_F77_ModeOpt = %CSF_F77_ModeOpt ; @endif; @set %CMPLRS_CXX_WOKDirectives = "-MD "; @@ -510,13 +518,21 @@ @end; @if ( %DebugMode == "True" ) then - @set %CMPLRS_CXX_ModeOpt = "-g0 -DDEB +w"; - @set %CMPLRS_C_ModeOpt = "-g0 -DDEB +w"; - @set %CMPLRS_F77_ModeOpt = "-g"; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb +-- @set %CMPLRS_CXX_ModeOpt = "-g0 -DDEB +w"; +-- @set %CMPLRS_C_ModeOpt = "-g0 -DDEB +w"; +-- @set %CMPLRS_F77_ModeOpt = "-g"; + @set %CMPLRS_CXX_ModeOpt = %CSF_CXX_ModeOptDeb ; + @set %CMPLRS_C_ModeOpt = %CSF_C_ModeOptDeb ; + @set %CMPLRS_F77_ModeOpt = %CSF_F77_ModeOptDeb ; @else - @set %CMPLRS_CXX_ModeOpt = "-O2 -DNo_Exception +w "; - @set %CMPLRS_C_ModeOpt = "-O2 -DNo_Exception +w "; - @set %CMPLRS_F77_ModeOpt = "-O2"; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb +-- @set %CMPLRS_CXX_ModeOpt = "-O2 -DNo_Exception +w "; +-- @set %CMPLRS_C_ModeOpt = "-O2 -DNo_Exception +w "; +-- @set %CMPLRS_F77_ModeOpt = "-O2"; + @set %CMPLRS_CXX_ModeOpt = %CSF_CXX_ModeOpt ; + @set %CMPLRS_C_ModeOpt = %CSF_C_ModeOpt ; + @set %CMPLRS_F77_ModeOpt = %CSF_F77_ModeOpt ; @endif; @set %CMPLRS_CXX_WOKDirectives = "-H "; @@ -661,17 +677,25 @@ @end; @if ( %DebugMode == "True" ) then - @set %CMPLRS_CXX_ModeOpt = "-DDEB -D_DEBUG"; - @set %CMPLRS_C_ModeOpt = "-DDEB -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"; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb +-- @set %CMPLRS_CXX_ModeOpt = "-DDEB -D_DEBUG"; +-- @set %CMPLRS_C_ModeOpt = "-DDEB -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"; + @set %CMPLRS_CXX_ModeOpt = %CSF_CXX_ModeOptDeb ; + @set %CMPLRS_C_ModeOpt = %CSF_C_ModeOptDeb ; + @set %CMPLRS_F77_ModeOpt = %CSF_F77_ModeOptDeb ; @else - @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"; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb +-- @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"; + @set %CMPLRS_CXX_ModeOpt = %CSF_CXX_ModeOpt ; + @set %CMPLRS_C_ModeOpt = %CSF_C_ModeOpt ; + @set %CMPLRS_F77_ModeOpt = %CSF_F77_ModeOpt ; @endif; @set %CMPLRS_CXX_WOKDirectives = ""; @@ -810,15 +834,21 @@ @set %CMPLRS_F77_Options = "-n32 -mips3"; @if ( %DebugMode == "True" ) then - @set %CMPLRS_CXX_ModeOpt = "-g -gslim -DDEB"; - @set %CMPLRS_C_ModeOpt = "-g -gslim -DDEB"; - @set %CMPLRS_F77_ModeOpt = "-g"; - @endif; - - @if ( %DebugMode == "False" ) then - @set %CMPLRS_CXX_ModeOpt = "-O3 -DNo_Exception -D__INLINE_INTRINSICS -TARG:processor=R10000 "; - @set %CMPLRS_C_ModeOpt = "-O3 -DNo_Exception -TARG:processor=R10000 "; - @set %CMPLRS_F77_ModeOpt = "-O3"; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb +-- @set %CMPLRS_CXX_ModeOpt = "-g -gslim -DDEB"; +-- @set %CMPLRS_C_ModeOpt = "-g -gslim -DDEB"; +-- @set %CMPLRS_F77_ModeOpt = "-g"; + @set %CMPLRS_CXX_ModeOpt = %CSF_CXX_ModeOptDeb ; + @set %CMPLRS_C_ModeOpt = %CSF_C_ModeOptDeb ; + @set %CMPLRS_F77_ModeOpt = %CSF_F77_ModeOptDeb ; + @else +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb +-- @set %CMPLRS_CXX_ModeOpt = "-O3 -DNo_Exception -D__INLINE_INTRINSICS -TARG:processor=R10000 "; +-- @set %CMPLRS_C_ModeOpt = "-O3 -DNo_Exception -TARG:processor=R10000 "; +-- @set %CMPLRS_F77_ModeOpt = "-O3"; + @set %CMPLRS_CXX_ModeOpt = %CSF_CXX_ModeOpt ; + @set %CMPLRS_C_ModeOpt = %CSF_C_ModeOpt ; + @set %CMPLRS_F77_ModeOpt = %CSF_F77_ModeOpt ; @endif; @set %CMPLRS_CXX_WOKDirectives = "-MDupdate "; diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl index 2d2f9d7..1e708af 100755 --- a/src/WOKBuilderDef/CSF.edl +++ b/src/WOKBuilderDef/CSF.edl @@ -11,7 +11,9 @@ @ifnotdefined ( %CSF_EDL ) then @set %CSF_EDL = ""; - @set %CSF_SYMBOLS = "C_COMPILER C_SysOptions C_Options CXX_COMPILER CXX_SysOptions CXX_Options F77_COMPILER F77_SysOptions F77_Options CSF_LINKER CXX_COMPILERLINKER CSF_VirtualDevice CSF_LINKER_CheckOpt CSF_LINKER_CheckOut LINKER_DBMSOpt LINKER_SysShared LINKER_SysExeC LINKER_SysExeW LINKER_SysOpt LINKER_SysLib LINKER_CheckOpt LINKER_CheckOut LibraryHeaderLib LibraryHeaderOpt JavaHome JavaLibs C_INCLUDE CXX_INCLUDE TCL_INCLUDE JAVA_COMPILER JAVA_JNI JAVA_INCLUDE X11_INCLUDE XMU_INCLUDE MOTIF_INCLUDE OPENGL_INCLUDE SOCKETLibs FPELibs ThreadLibs kernel32 advapi32 gdi32 user32 glu32 opengl32 wsock32 dpsLibs XwLibs OpenGlLibs MotifLibs TclLibs TclTkLibs DOXIGEN_HOME GRAPVIZ_HOME" ; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb +-- @set %CSF_SYMBOLS = "C_COMPILER C_SysOptions C_Options CXX_COMPILER CXX_SysOptions CXX_Options F77_COMPILER F77_SysOptions F77_Options CSF_LINKER CXX_COMPILERLINKER CSF_VirtualDevice CSF_LINKER_CheckOpt CSF_LINKER_CheckOut LINKER_DBMSOpt LINKER_SysShared LINKER_SysExeC LINKER_SysExeW LINKER_SysOpt LINKER_SysLib LINKER_CheckOpt LINKER_CheckOut LibraryHeaderLib LibraryHeaderOpt JavaHome JavaLibs C_INCLUDE CXX_INCLUDE TCL_INCLUDE JAVA_COMPILER JAVA_JNI JAVA_INCLUDE X11_INCLUDE XMU_INCLUDE MOTIF_INCLUDE OPENGL_INCLUDE SOCKETLibs FPELibs ThreadLibs kernel32 advapi32 gdi32 user32 glu32 opengl32 wsock32 dpsLibs XwLibs OpenGlLibs MotifLibs TclLibs TclTkLibs DOXIGEN_HOME GRAPVIZ_HOME" ; + @set %CSF_SYMBOLS = "C_COMPILER C_SysOptions C_Options C_ModeOpt C_ModeOptDeb CXX_COMPILER CXX_SysOptions CXX_Options CXX_ModeOpt CXX_ModeOptDeb F77_COMPILER F77_SysOptions F77_Options F77_ModeOpt F77_ModeOptDeb CSF_LINKER CXX_COMPILERLINKER CSF_VirtualDevice CSF_LINKER_CheckOpt CSF_LINKER_CheckOut LINKER_DBMSOpt LINKER_SysShared LINKER_SysExeC LINKER_SysExeW LINKER_SysOpt LINKER_SysLib LINKER_CheckOpt LINKER_CheckOut LibraryHeaderLib LibraryHeaderOpt JavaHome JavaLibs C_INCLUDE CXX_INCLUDE TCL_INCLUDE JAVA_COMPILER JAVA_JNI JAVA_INCLUDE X11_INCLUDE XMU_INCLUDE MOTIF_INCLUDE OPENGL_INCLUDE SOCKETLibs FPELibs ThreadLibs kernel32 advapi32 gdi32 user32 glu32 opengl32 wsock32 dpsLibs XwLibs OpenGlLibs MotifLibs TclLibs TclTkLibs DOXIGEN_HOME GRAPVIZ_HOME" ; @set %CSF_CREATECOMP_DEP = "Yes" ; @set %CSF_USE_EXTERNLIB = "Yes" ; @@ -24,14 +26,23 @@ @set %CSF_C_COMPILER = ""; @set %CSF_C_SysOptions = ""; @set %CSF_C_Options = ""; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb + @set %CSF_C_ModeOpt = ""; + @set %CSF_C_ModeOptDeb = ""; @set %CSF_CXX_COMPILER = ""; @set %CSF_CXX_SysOptions = ""; @set %CSF_CXX_Options = ""; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb + @set %CSF_CXX_ModeOpt = ""; + @set %CSF_CXX_ModeOptDeb = ""; @set %CSF_F77_COMPILER = ""; @set %CSF_F77_SysOptions = ""; @set %CSF_F77_Options = ""; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb + @set %CSF_F77_ModeOpt = ""; + @set %CSF_F77_ModeOptDeb = ""; @set %CSF_LINKER = ""; @set %CSF_CSF_VirtualDevice = ""; @@ -126,6 +137,9 @@ @endif; @set %CSF_CXX_SysOptions = "-fPIC -funsigned-char -Wall -fmessage-length=0"; @string %CSF_CXX_Options = "-DLIN -DLININTEL -DOCC_CONVERT_SIGNALS " %STLPortInclude; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb + @set %CSF_CXX_ModeOpt = " -O3 -DNDEBUG -DNo_Exception "; + @set %CSF_CXX_ModeOptDeb = " -g -O0 -DDEB -D_DEBUG "; --<< TODO : If applicable , modify the location of the c compiler. @set %CSF_C_COMPILER = "/usr/bin/gcc "; @@ -134,12 +148,18 @@ @set %CSF_C_SysOptions = "-fPIC -funsigned-char -Wall -fexceptions"; @set %CSF_C_Options = "-DLIN -DLININTEL "; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb + @set %CSF_C_ModeOpt = " -O3 -DNDEBUG -DNo_Exception "; + @set %CSF_C_ModeOptDeb = " -g -O0 -DDEB -D_DEBUG "; --<< TODO : If applicable , modify the location of the Fortran compiler. @set %CSF_F77_COMPILER = "/usr/bin/f77 "; -->> END TODO @set %CSF_F77_SysOptions = "-fPIC "; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb + @set %CSF_F77_ModeOpt = " -O3 -DNDEBUG -DNo_Exception "; + @set %CSF_F77_ModeOptDeb = " -g -DDEB -D_DEBUG "; @string %CSF_LINKER = "/usr/bin/ld " %STLPortLib; @set %CSF_CXX_COMPILERLINKER = %CSF_CXX_COMPILER ; @@ -205,6 +225,9 @@ @endif; @set %CSF_CXX_SysOptions = "-PIC -xchip=ultra -xarch=v8 -vdelx -Usun -instances=static " ; @string %CSF_CXX_Options = "-DSOLARIS -DOCC_CONVERT_SIGNALS "%STLPortInclude ; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb + @set %CSF_CXX_ModeOpt = " -O2 -DNo_Exception +w "; + @set %CSF_CXX_ModeOptDeb = " -g0 -DDEB +w "; --yan @string %CSF_CXX_INCLUDE += " -I/opt/DEV5_1/SUNWspro/SC4.2/include/CC "; @string %CSF_CXX_INCLUDE += " -I" %CSF_CXX_COMPILER "/../../SC4.2/include/CC "; @@ -215,9 +238,15 @@ @set %CSF_C_SysOptions = "-K PIC -Usun "; @set %CSF_C_Options = "-DSOLARIS "; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb + @set %CSF_C_ModeOpt = " -O2 -DNo_Exception +w "; + @set %CSF_C_ModeOptDeb = " -g0 -DDEB +w "; @set %CSF_F77_COMPILER = "f77 "; @set %CSF_F77_SysOptions = "-PIC"; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb + @set %CSF_F77_ModeOpt = " -O2 "; + @set %CSF_F77_ModeOptDeb = " -g "; @set %CSF_LINKER = "/usr/ccs/bin/ld "; @set %CSF_CXX_COMPILERLINKER = %CSF_CXX_COMPILER ; @@ -287,22 +316,33 @@ @set %STLPortLib = ""; @endif; - @set %CSF_CXX_SysOptions = "-nologo -MD -W3 -GX -Ob1 -Zi "; @string %CSF_CXX_Options = "-DWNT -D_WINDOWS -DWIN32 " %STLPortInclude; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb +-- @set %CSF_CXX_SysOptions = "-nologo -MD -W3 -GX -Ob1 -Zi "; + @set %CSF_CXX_SysOptions = " -nologo -W3 "; + @set %CSF_CXX_ModeOpt = " -MD -GX -O2 -DNDEBUG -DNo_Exception "; + @set %CSF_CXX_ModeOptDeb = " -MDd -Gm -GX -Od -Zi -DDEB -D_DEBUG "; --<< TODO : If applicable , modify the root location where c compiler is installed (same as above). @set %CSF_C_COMPILER = "D:/DevTools/VStudio/VC98/bin/cl "; @string %CSF_C_INCLUDE += ""; -->> END TODO - @set %CSF_C_SysOptions = "-nologo -MD -W3 -GX -Ob1 -Zi "; @set %CSF_C_Options = "-DWNT -D_WINDOWS -DWIN32 "; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb +-- @set %CSF_C_SysOptions = "-nologo -MD -W3 -GX -Ob1 -Zi "; + @set %CSF_C_SysOptions = " -nologo -W3 "; + @set %CSF_C_ModeOpt = " -MD -GX -O2 -DNDEBUG -DNo_Exception "; + @set %CSF_C_ModeOptDeb = " -MDd -Gm -GX -Od -Zi -DDEB -D_DEBUG "; --<< TODO : If applicable , modify the root location where the Fortran compiler is installed. @set %CSF_F77_COMPILER = "D:/DevTools/VStudio/DF98/bin/fl32 "; -->> END TODO @set %CSF_F77_SysOptions = "-nologo -libs:dll -Zi "; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb + @set %CSF_F77_ModeOpt = " -DNDEBUG -DNo_Exception "; + @set %CSF_F77_ModeOptDeb = " -DDEB -D_DEBUG "; @set %CSF_LINKER = "D:/DevTools/VStudio/VC98/bin/link "; @set %CSF_CXX_COMPILERLINKER = %CSF_LINKER ; @@ -406,6 +446,9 @@ @string %CSF_C_INCLUDE += ""; @set %CSF_C_SysOptions = " -signed -n32 -mips4 "; @set %CSF_C_Options = "-DIRIX "; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb + @set %CSF_C_ModeOpt = " -O3 -DNo_Exception -TARG:processor=R10000 "; + @set %CSF_C_ModeOptDeb = " -g -gslim -DDEB "; @set %CSF_CXX_COMPILER = "/usr/bin/CC "; @set %STLPortHome = ""; @@ -419,9 +462,16 @@ @set %CSF_CXX_SysOptions = " -signed -n32 -mips4 -woff 3115 -woff 3273 -woff 1021 -woff 1188 -woff 1460 -woff 3303 -ptused"; @string %CSF_CXX_Options = "-DIRIX -DOCC_CONVERT_SIGNALS " %STLPortInclude; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb + @set %CSF_CXX_ModeOpt = " -O3 -DNo_Exception -D__INLINE_INTRINSICS -TARG:processor=R10000 "; + @set %CSF_CXX_ModeOptDeb = " -g -gslim -DDEB "; @set %CSF_F77_COMPILER = "f77 "; +-- Corrected by APV: *_SysOptions, *_ModeOpt and *_ModeOptDeb + @set %CSF_F77_ModeOpt = " -O3 "; + @set %CSF_F77_ModeOptDeb = " -g "; + @set %CSF_LINKER = "/usr/bin/ld"; @set %CSF_CXX_COMPILERLINKER = %CSF_CXX_COMPILER ; @set %CSF_LINKER_SysShared = " -shared ";