0023798: WOK should support the compilation of OCCT versions that use ftgl

diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl
index f14f0f0249f5340a3148af37df740825f663dab5..86dc6bdfa1ac58f13f90b1544de4b01122b6fd4c 100755 (executable)
--- a/src/WOKBuilderDef/CSF.edl
+++ b/src/WOKBuilderDef/CSF.edl
@@ -11,7 +11,7 @@
   @string %CSF_SYMBOLS += " F77_COMPILER F77_SysOptions F77_Options F77_ModeOpt F77_ModeOptDeb";
   @string %CSF_SYMBOLS += " 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";
   @string %CSF_SYMBOLS += " JavaHome JavaLibs JAVA_COMPILER JAVA_JNI JAVA_INCLUDE";
-  @string %CSF_SYMBOLS += " TCL_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 FREETYPE_INCLUDES CSF_GL2PS_INCLUDES CSF_GL2PS GRAPVIZ_HOME CSF_QT_INCLUDES CSF_QT";
+  @string %CSF_SYMBOLS += " TCL_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 FREETYPE_INCLUDES FTGL_INCLUDES CSF_FTGL CSF_GL2PS_INCLUDES CSF_GL2PS GRAPVIZ_HOME CSF_QT_INCLUDES CSF_QT";
 
   @set %CSF_CREATECOMP_DEP = "Yes";
   @set %CSF_USE_EXTERNLIB  = "Yes";
@@ -99,6 +99,9 @@
     @set %CSF_FREETYPE = "-lfreetype ";
   @endif;
 
+-- variable is required for support for OCCT version that use fgtl
+  @set %CSF_FTGL_INCLUDES = "";
+  
   @set %CSF_GL2PS_INCLUDES = "";
   @set %CSF_GL2PS = "";
   @set %CSF_TBB_INCLUDES = "";

diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl
index 8e382c91355411a273738338b6777d766120945a..3d07339ab55336506c787648e180eae02b0a58b8 100755 (executable)
--- a/src/WOKTclLib/osutils.tcl
+++ b/src/WOKTclLib/osutils.tcl
@@ -241,7 +241,8 @@ proc osutils:juststation {goaway listloc} {
 }
 
 proc osutils:justwnt { listloc } {
-  set goaway [list Xdps Xw WOKUnix]
+  # ImageUtility is required for support for old (<6.5.4) versions of OCCT
+  set goaway [list Xdps Xw  ImageUtility WOKUnix]
   return [osutils:juststation $goaway $listloc]
 }
 
@@ -1803,10 +1804,14 @@ proc osutils:csfList { theOS  theCsfMap } {
 
     set aCsfMap(CSF_MotifLibs)  "X11"
 
-    # -- Tcl/Tk configuration
+    #-- Tcl/Tk configuration
     set aCsfMap(CSF_TclLibs)    "tcl8.5"
     set aCsfMap(CSF_TclTkLibs)  "tk8.5 X11"
 
+    # variable is required for support for OCCT version that use fgtl
+    #-- FTGL (font renderer for OpenGL)
+    set aCsfMap(CSF_FTGL)       "ftgl"
+    
     #-- FreeType
     set aCsfMap(CSF_FREETYPE)   "freetype"