From ec45e5212fe39e88586eee40d26ab092e813e324 Mon Sep 17 00:00:00 2001 From: ibs Date: Wed, 13 Feb 2013 15:33:49 +0400 Subject: [PATCH] 0023758: Removing support of FTGL product and FontMFT from WOK 0023750: FontMFT support should be removed from WOK --- src/WOKBuilderDef/CSF.edl | 4 +- src/WOKBuilderDef/CSF_LIN.edl | 3 - src/WOKBuilderDef/CSF_MAC.edl | 3 - src/WOKBuilderDef/CSF_WNT.edl | 3 - src/WOKTclLib/osutils.tcl | 3 - src/WOKTclLib/templates/custom.sh.in | 1 - src/WOKTclLib/templates/env.bat | 1 - src/WOKTclLib/templates/env.bat.in | 4 +- src/WOKTclLib/templates/env.sh | 1 - src/WOKTclLib/templates/env.sh.in | 5 -- src/WOKTclLib/templates/template.ac | 106 ------------------------- src/WOKTclLib/templates/template.cmake | 4 - src/WOKsite/wok_deps.tcl | 62 --------------- src/WOKsite/wok_depsgui.tcl | 1 - src/WOKsite/wok_tclshrc.tcl | 9 --- 15 files changed, 2 insertions(+), 208 deletions(-) diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl index 314e23c..f14f0f0 100755 --- 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 FTGL_INCLUDES CSF_FTGL 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 CSF_GL2PS_INCLUDES CSF_GL2PS GRAPVIZ_HOME CSF_QT_INCLUDES CSF_QT"; @set %CSF_CREATECOMP_DEP = "Yes"; @set %CSF_USE_EXTERNLIB = "Yes"; @@ -99,8 +99,6 @@ @set %CSF_FREETYPE = "-lfreetype "; @endif; - @set %CSF_FTGL_INCLUDES = ""; - @set %CSF_FTGL = ""; @set %CSF_GL2PS_INCLUDES = ""; @set %CSF_GL2PS = ""; @set %CSF_TBB_INCLUDES = ""; diff --git a/src/WOKBuilderDef/CSF_LIN.edl b/src/WOKBuilderDef/CSF_LIN.edl index 6c81250..06e6e60 100644 --- a/src/WOKBuilderDef/CSF_LIN.edl +++ b/src/WOKBuilderDef/CSF_LIN.edl @@ -73,7 +73,4 @@ @string %CSF_TclTkLibs = " -ltk8.5 -L" %X11_LIB " -lX11 "; @endif; - -- FTGL (font renderer for OpenGL) - @set %CSF_FTGL = "-lftgl "; - @endif; diff --git a/src/WOKBuilderDef/CSF_MAC.edl b/src/WOKBuilderDef/CSF_MAC.edl index eb07a3d..375b0ab 100644 --- a/src/WOKBuilderDef/CSF_MAC.edl +++ b/src/WOKBuilderDef/CSF_MAC.edl @@ -85,7 +85,4 @@ @string %CSF_TclTkLibs = "-L" %X11_LIB " -lX11 -ltk8.5 "; @endif; - -- FTGL (font renderer for OpenGL) - @set %CSF_FTGL = "-lftgl "; - @endif; diff --git a/src/WOKBuilderDef/CSF_WNT.edl b/src/WOKBuilderDef/CSF_WNT.edl index a80b392..74ce672 100644 --- a/src/WOKBuilderDef/CSF_WNT.edl +++ b/src/WOKBuilderDef/CSF_WNT.edl @@ -73,9 +73,6 @@ @string %CSF_TclLibs = "tcl85.lib"; @string %CSF_TclTkLibs = "tk85.lib"; - -- FTGL (font renderer for OpenGL) - @string %CSF_FTGL = ""; - -- Qt4 framework, doesn't required for OCCT itself @string %CSF_QT_INCLUDES = " "; @string %CSF_QT = "QtCore4.lib QtGui4.lib"; diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl index c9bd150..e146d86 100755 --- a/src/WOKTclLib/osutils.tcl +++ b/src/WOKTclLib/osutils.tcl @@ -1861,9 +1861,6 @@ proc osutils:csfList { theOS theCsfMap } { set aCsfMap(CSF_TclLibs) "tcl8.5" set aCsfMap(CSF_TclTkLibs) "tk8.5 X11" - #-- FTGL (font renderer for OpenGL) - set aCsfMap(CSF_FTGL) "ftgl" - #-- FreeType set aCsfMap(CSF_FREETYPE) "freetype" diff --git a/src/WOKTclLib/templates/custom.sh.in b/src/WOKTclLib/templates/custom.sh.in index 01a87b8..59fca09 100644 --- a/src/WOKTclLib/templates/custom.sh.in +++ b/src/WOKTclLib/templates/custom.sh.in @@ -2,7 +2,6 @@ # # Mandatory 3rd-parties switches export HAVE_FREETYPE=@HAVE_FREETYPE@ -export HAVE_FTGL=@HAVE_FTGL@ export HAVE_TCLTK=@HAVE_TCLTK@ # Optional 3rd-parties switches export HAVE_FREEIMAGE=@HAVE_FREEIMAGE@ diff --git a/src/WOKTclLib/templates/env.bat b/src/WOKTclLib/templates/env.bat index 7329b90..69b92f1 100644 --- a/src/WOKTclLib/templates/env.bat +++ b/src/WOKTclLib/templates/env.bat @@ -105,7 +105,6 @@ if not ["%CASDEB%"] == [""] if ["%ARCH%"] == ["32"] set "PATH=%CSF_OPT_BIN32D%;% if not ["%CASDEB%"] == [""] if ["%ARCH%"] == ["64"] set "PATH=%CSF_OPT_BIN64D%;%PATH%" rem ----- Set envoronment variables used by OCCT ----- -set "CSF_MDTVFontDirectory=%CASROOT%\src\FontMFT" set CSF_LANGUAGE=us set MMGT_CLEAR=1 set CSF_EXCEPTION_PROMPT=1 diff --git a/src/WOKTclLib/templates/env.bat.in b/src/WOKTclLib/templates/env.bat.in index f88cf75..edf89f0 100644 --- a/src/WOKTclLib/templates/env.bat.in +++ b/src/WOKTclLib/templates/env.bat.in @@ -6,7 +6,6 @@ set "SCRIPTROOT=%SCRIPTROOT:~0,-1%" @CASROOT_DEFINITION@ set "FREETYPE_DIR=@3RDPARTY_FREETYPE_DLL_DIR@" -set "FTGL_DIR=@3RDPARTY_FTGL_DLL_DIR@" set "GL2PS_DIR=@3RDPARTY_GL2PS_DLL_DIR@" set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@" @@ -14,13 +13,12 @@ set "FREEIMAGE_DIR=@3RDPARTY_FREEIMAGE_DLL_DIR@" set "TCL_DIR=@3RDPARTY_TCL_DLL_DIR@" -set "PATH=%FREETYPE_DIR%;%FTGL_DIR%;%GL2PS_DIR%;%FREEIMAGE_DIR%;%TBB_DIR%;%TCL_DIR%;%PATH%" +set "PATH=%FREETYPE_DIR%;%GL2PS_DIR%;%FREEIMAGE_DIR%;%TBB_DIR%;%TCL_DIR%;%PATH%" rem ----- Set path to 3rd party and OCCT libraries ----- set "PATH=%SCRIPTROOT%\@BIN_DIR_POSTFIX@;%PATH%" rem ----- Set envoronment variables used by OCCT ----- -set "CSF_MDTVFontDirectory=@RESOURCE_DIR_PREFIX@\FontMFT" set CSF_LANGUAGE=us set MMGT_CLEAR=1 set CSF_EXCEPTION_PROMPT=1 diff --git a/src/WOKTclLib/templates/env.sh b/src/WOKTclLib/templates/env.sh index 89ddb57..852ac91 100755 --- a/src/WOKTclLib/templates/env.sh +++ b/src/WOKTclLib/templates/env.sh @@ -118,7 +118,6 @@ if [ "$WOKSTATION" == "mac" ]; then fi # Set envoronment variables used by OCCT -export CSF_MDTVFontDirectory="${CASROOT}/src/FontMFT" export CSF_LANGUAGE="us" export MMGT_CLEAR="1" export CSF_EXCEPTION_PROMPT="1" diff --git a/src/WOKTclLib/templates/env.sh.in b/src/WOKTclLib/templates/env.sh.in index fe71d1f..0e119f0 100644 --- a/src/WOKTclLib/templates/env.sh.in +++ b/src/WOKTclLib/templates/env.sh.in @@ -3,7 +3,6 @@ echo off aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD"; FREETYPE_DIR="@3RDPARTY_FREETYPE_DLL_DIR@" -FTGL_DIR="@3RDPARTY_FTGL_DLL_DIR@" GL2PS_DIR="@3RDPARTY_GL2PS_DLL_DIR@" TBB_DIR="@3RDPARTY_TBB_DLL_DIR@" @@ -24,9 +23,6 @@ fi if [ "$GL2PS_DIR" != "" ]; then aLibPath="${GL2PS_DIR}:${aLibPath}" fi -if [ "$FTGL_DIR" != "" ]; then - aLibPath="${FTGL_DIR}:${aLibPath}" -fi if [ "$FREETYPE_DIR" != "" ]; then aLibPath="${FREETYPE_DIR}:${aLibPath}" fi @@ -64,7 +60,6 @@ if [ "$aSystem" == "Darwin" ]; then fi # ----- Set envoronment variables used by OCCT ----- -export CSF_MDTVFontDirectory="${aScriptPath}/res/FontMFT" export CSF_LANGUAGE=us export MMGT_CLEAR=1 export CSF_EXCEPTION_PROMPT=1 diff --git a/src/WOKTclLib/templates/template.ac b/src/WOKTclLib/templates/template.ac index 4d258a0..b8cf395 100644 --- a/src/WOKTclLib/templates/template.ac +++ b/src/WOKTclLib/templates/template.ac @@ -489,108 +489,6 @@ else fi AM_CONDITIONAL( HAVE_FREETYPE, [test "xyes" = "x$HAVE_FREETYPE"] ) -#--------------------------------------------------------------------- -# -# Check for FTGL Libraries -# -# -#--------------------------------------------------------------------- -AC_ARG_WITH([ftgl], - [AC_HELP_STRING([--with-ftgl=DIR],[Location of FTGL])], - [ftgl="${withval}"],[ftgl=yes]) - -CSF_FTGL_INCLUDES="" -CSF_FTGL_LIB="" -HAVE_FTGL=no - -if test "xno" = "x${HAVE_FREETYPE}"; then - DISABLE_FTGL_REASON=$DISABLE_FREETYPE_REASON -else - AC_LANG([C++]) - if test "xno" = "x${ftgl}"; then - dnl ftgl check is explicitly disabled by --without-ftgl or --with-ftgl=no - AC_MSG_NOTICE([ftgl check is explicitly disabled]) - DISABLE_FTGL_REASON="(ftgl check was explicitly disabled)" - else - if test "xyes" = "x${ftgl}" -o "x/usr" = "x${ftgl}"; then - dnl try native ftgl (default) - ftgl=/usr - AC_MSG_NOTICE(try system ftgl) - FTGL_INCLUDES="-I/usr/include/FTGL" - FTGL_LIBS="-lftgl" - FTGL_OPT_INC="/usr/include/FTGL" - FTGL_OPT_LIB= - else - AC_MSG_NOTICE(try ftgl in ${ftgl}) - if test ! -d ${ftgl}; then - DISABLE_FTGL_REASON="(${ftgl} directory does not exists)" - AC_MSG_ERROR([${ftgl} directory does not exists]) - fi - FTGL_INCLUDES="-I${ftgl}/include -I${ftgl}/include/FTGL" - FTGL_LIBS="-L${ftgl}/lib -lftgl" - FTGL_OPT_INC="${ftgl}/include:${ftgl}/include/FTGL" - FTGL_OPT_LIB="${ftgl}/lib" - fi - for hf in ftgl.h FTGL.h; do - dnl check presence of ftgl header file in the specified directory - test -f ${ftgl}/include/FTGL/${hf} -o -f ${ftgl}/include/${hf} && HAVE_FTGL_INC=yes - test "xyes" = "x${HAVE_FTGL_INC}" -a "${hf}" = "FTGL.h" && HAVE_FTGL_UPPERCASE=-DHAVE_FTGL_UPPERCASE - test "xyes" = "x${HAVE_FTGL_INC}" && break - done - if test "xyes" = "x${HAVE_FTGL_INC}" ; then - CPPFLAGS_old=${CPPFLAGS} - LDFLAGS_old=${LDFLAGS} - CPPFLAGS="${FTGL_INCLUDES} ${HAVE_FTGL_UPPERCASE} ${CSF_FREETYPE_INCLUDES} $CPPFLAGS" - LDFLAGS="${FTGL_LIBS} ${CSF_FREETYPE_LIB} $LDFLAGS" - AC_CHECK_HEADERS([${hf}], - [ - HAVE_FTGL_INC=yes - break - ], - [ - HAVE_FTGL_INC=no - ]) - if test "x${HAVE_FTGL_INC}" = "xyes"; then - AC_MSG_CHECKING([for FTGLTextureFont in -lftgl]) - CPPFLAGS="${FTGL_INCLUDES} ${HAVE_FTGL_UPPERCASE} ${CSF_FREETYPE_INCLUDES} ${CPPFLAGS_old}" - AC_TRY_LINK( - [ - #ifdef HAVE_FTGL_UPPERCASE - #include - #include - #else - #include - #endif - ], - [ - FTGLTextureFont font(""); - ], - [ - AC_MSG_RESULT(yes) - HAVE_FTGL=yes - CSF_FTGL_INCLUDES="${FTGL_INCLUDES} ${HAVE_FTGL_UPPERCASE}" - CSF_FTGL_LIB="${FTGL_LIBS}" - CSF_OPT_INC="${FTGL_OPT_INC}:${CSF_OPT_INC}" - CSF_OPT_LIB="${FTGL_OPT_LIB}:${CSF_OPT_LIB}" - ], - [ - AC_MSG_RESULT(no) - DISABLE_FTGL_REASON="(ftgl was not found)" - AC_MSG_ERROR([Unable to locate the required ftgl library]) - ]) - else - DISABLE_FTGL_REASON="(ftgl was not found)" - fi - CPPFLAGS=${CPPFLAGS_old} - LDFLAGS=${LDFLAGS_old} - else - AC_MSG_RESULT([ftgl was not found]) - DISABLE_FTGL_REASON="(ftgl was not found)" - fi - fi -fi -AM_CONDITIONAL( HAVE_FTGL, [test "xyes" = "x$HAVE_FTGL"] ) - #--------------------------------------------------------------------- # # Check for GL2PS Libraries @@ -925,9 +823,6 @@ AC_SUBST(CSF_OpenGlLibs_LIB) AC_SUBST(HAVE_FREETYPE) AC_SUBST(CSF_FREETYPE_INCLUDES) AC_SUBST(CSF_FREETYPE_LIB) -AC_SUBST(HAVE_FTGL) -AC_SUBST(CSF_FTGL_INCLUDES) -AC_SUBST(CSF_FTGL_LIB) AC_SUBST(HAVE_GL2PS) AC_SUBST(CSF_GL2PS_INCLUDES) AC_SUBST(CSF_GL2PS_LIB) @@ -964,7 +859,6 @@ echo echo "3rdparty mandatory products " echo "---------------------------------" echo "freetype : $HAVE_FREETYPE $DISABLE_FREETYPE_REASON" -echo "ftgl : $HAVE_FTGL $DISABLE_FTGL_REASON" echo "tcltk : $HAVE_TCLTK $DISABLE_TCLTK_REASON" echo echo "3rdparty optional products " diff --git a/src/WOKTclLib/templates/template.cmake b/src/WOKTclLib/templates/template.cmake index 68ed117..e3d2316 100644 --- a/src/WOKTclLib/templates/template.cmake +++ b/src/WOKTclLib/templates/template.cmake @@ -97,7 +97,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/bin) # RESOURCES install(DIRECTORY "__CASROOT_DIR__/src/DrawResources" DESTINATION "${INSTALL_DIR}/res" ) install(DIRECTORY "__CASROOT_DIR__/src/StdResource" DESTINATION "${INSTALL_DIR}/res" ) -install(DIRECTORY "__CASROOT_DIR__/src/FontMFT" DESTINATION "${INSTALL_DIR}/res" ) install(DIRECTORY "__CASROOT_DIR__/src/SHMessage" DESTINATION "${INSTALL_DIR}/res" ) install(DIRECTORY "__CASROOT_DIR__/src/Textures" DESTINATION "${INSTALL_DIR}/res" ) install(DIRECTORY "__CASROOT_DIR__/src/XSMessage" DESTINATION "${INSTALL_DIR}/res" ) @@ -273,9 +272,6 @@ ENDIF() # FREETYPE THIRDPARTY_PRODUCT("FREETYPE" "freetype/freetype.h" "freetype${BUILD_SUFFIX}") -# FTGL -THIRDPARTY_PRODUCT("FTGL" "FTGL/ftgl.h" "ftgl${BUILD_SUFFIX}") - # FREEIMAGE IF(3RDPARTY_USE_FREEIMAGE) ADD_DEFINITIONS(-DHAVE_FREEIMAGE) diff --git a/src/WOKsite/wok_deps.tcl b/src/WOKsite/wok_deps.tcl index c82f9c7..b2515fa 100644 --- a/src/WOKsite/wok_deps.tcl +++ b/src/WOKsite/wok_deps.tcl @@ -344,68 +344,6 @@ proc wokdep:SearchFreeType {theErrInc theErrLib32 theErrLib64 theErrBin32 theErr return "$isFound" } -# Search FTGL library placement -proc wokdep:SearchFTGL {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} { - upvar $theErrInc anErrInc - upvar $theErrLib32 anErrLib32 - upvar $theErrLib64 anErrLib64 - upvar $theErrBin32 anErrBin32 - upvar $theErrBin64 anErrBin64 - - # The path in the case of building VS project on windows - set aWinBuildPath "msvc/Build" - - set isFound "true" - set aFtglFontPath [wokdep:SearchHeader "FTGL/FTGLTextureFont.h"] - set aFtglFtLibPath [wokdep:SearchHeader "FTGL/ftgl.h"] - if { "$aFtglFontPath" == "" || "$aFtglFtLibPath" == "" } { - set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{ftgl,FTGL}*] "$::VCVER" "$::ARCH" ] - if { "$aPath" != "" && [file exists "$aPath/include/FTGL/ftgl.h"] } { - lappend ::CSF_OPT_INC "$aPath/include" - } else { - lappend anErrInc "Error: 'FTGL/ftgl.h' not found (FTGL)" - set isFound "false" - } - } - - foreach anArchIter {64 32} { - set aFtglLibPath [wokdep:SearchLib "ftgl" "$anArchIter"] - if { "$aFtglLibPath" == "" } { - set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{ftgl,FTGL}*] "$::VCVER" "$anArchIter" ] - set aFtglLibPath [wokdep:SearchLib "ftgl" "$anArchIter" "$aPath/lib"] - if { "$aFtglLibPath" != "" } { - lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib" - } else { - set aFtglLibPath [wokdep:SearchLib "ftgl" "$anArchIter" "$aPath/$aWinBuildPath"] - if { "$::tcl_platform(platform)" == "windows" && "$aFtglLibPath" != "" } { - lappend ::CSF_OPT_LIB$anArchIter "$aPath/$aWinBuildPath" - } else { - lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}ftgl.${::SYS_LIB_SUFFIX}' not found (FTGL)" - if { "$::ARCH" == "$anArchIter"} { set isFound "false" } - } - } - } - if { "$::tcl_platform(platform)" == "windows" } { - set aFtglDllPath [wokdep:SearchBin "ftgl.dll" "$anArchIter"] - if { "$aFtglDllPath" == "" } { - set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{ftgl}*] "$::VCVER" "$anArchIter" ] - set aFtglDllPath [wokdep:SearchBin "ftgl.dll" "$anArchIter" "$aPath/bin"] - set aFtglWinDllPath [wokdep:SearchBin "ftgl.dll" "$anArchIter" "$aPath/$aWinBuildPath"] - if { "$aFtglDllPath" != "" } { - lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin" - } elseif { "$aFtglWinDllPath" != "" } { - lappend ::CSF_OPT_BIN$anArchIter "$aPath/$aWinBuildPath" - } else { - lappend anErrBin$anArchIter "Error: 'ftgl.dll' not found (FTGL)" - if { "$::ARCH" == "$anArchIter"} { set isFound "false" } - } - } - } - } - - return "$isFound" -} - # Search FreeImage library placement proc wokdep:SearchFreeImage {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} { upvar $theErrInc anErrInc diff --git a/src/WOKsite/wok_depsgui.tcl b/src/WOKsite/wok_depsgui.tcl index 59d537c..fd8a67b 100644 --- a/src/WOKsite/wok_depsgui.tcl +++ b/src/WOKsite/wok_depsgui.tcl @@ -82,7 +82,6 @@ proc wokdep:gui:UpdateList {} { set anBin64Errs {} wokdep:SearchTclTk anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs wokdep:SearchFreeType anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs - wokdep:SearchFTGL anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs wokdep:SearchX11 anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs if { "$::HAVE_FREEIMAGE" == "true" } { wokdep:SearchFreeImage anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs diff --git a/src/WOKsite/wok_tclshrc.tcl b/src/WOKsite/wok_tclshrc.tcl index 3dac91e..fdeefd6 100644 --- a/src/WOKsite/wok_tclshrc.tcl +++ b/src/WOKsite/wok_tclshrc.tcl @@ -154,9 +154,6 @@ if { [wokdep:SearchTclTk anErrs anErrs anErrs anErrs anErrs] == "false" } { if { [wokdep:SearchFreeType anErrs anErrs anErrs anErrs anErrs] == "false" } { puts " not found: FreeType2 (Major!)" } -if { [wokdep:SearchFTGL anErrs anErrs anErrs anErrs anErrs] == "false" } { - puts " not found: FTGL (Major!)" -} if { "$::HAVE_FREEIMAGE" == "true" } { if { [wokdep:SearchFreeImage anErrs anErrs anErrs anErrs anErrs] == "false" } { puts " not found: FreeImage (Optional, enabled)" @@ -444,12 +441,6 @@ proc wenv {} { } else { puts "Warning! 'Textures' package not found!" } - set aFontMft [woklocate -u FontMFT] - if { $aFontMft != "" } { - set env(CSF_MDTVFontDirectory) [string range [wokinfo -p source:. [woklocate -u FontMFT]] 0 [expr {[string length [wokinfo -p source:. $aFontMft]] - 3}]] - } else { - puts "Warning! 'FontMFT' package not found!" - } set aXSMsg [woklocate -u XSMessage] if { $aXSMsg != "" } { -- 2.39.5