From a9b51f49770330789d65438353c612379375a956 Mon Sep 17 00:00:00 2001 From: kgv Date: Sat, 30 Apr 2016 17:12:57 +0300 Subject: [PATCH] 0027424: Configuration, genconf.tcl - add missing option to enable TKD3DHost in configurator --- adm/genconf.tcl | 8 ++++++++ adm/genconfdeps.tcl | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/adm/genconf.tcl b/adm/genconf.tcl index e90a70d146..6b22f1004b 100644 --- a/adm/genconf.tcl +++ b/adm/genconf.tcl @@ -384,6 +384,10 @@ checkbutton .myFrame.myChecks.myGl2psCheck -offvalue "false" -onvalue "true ttk::label .myFrame.myChecks.myGl2psLbl -text "Use GL2PS" checkbutton .myFrame.myChecks.myTbbCheck -offvalue "false" -onvalue "true" -variable HAVE_TBB -command wokdep:gui:UpdateList ttk::label .myFrame.myChecks.myTbbLbl -text "Use Intel TBB" +if { "$::tcl_platform(platform)" == "windows" } { + checkbutton .myFrame.myChecks.myD3dCheck -offvalue "false" -onvalue "true" -variable HAVE_D3D -command wokdep:gui:UpdateList + ttk::label .myFrame.myChecks.myD3dLbl -text "Use Direct3D" +} #checkbutton .myFrame.myChecks.myOpenClCheck -offvalue "false" -onvalue "true" -variable HAVE_OPENCL -command wokdep:gui:UpdateList #ttk::label .myFrame.myChecks.myOpenClLbl -text "Use OpenCL" checkbutton .myFrame.myChecks.myMacGLXCheck -offvalue "false" -onvalue "true" -variable MACOSX_USE_GLX @@ -483,6 +487,10 @@ grid .myFrame.myChecks.myTbbCheck -row $aCheckRowIter -column 2 -sticky e grid .myFrame.myChecks.myTbbLbl -row $aCheckRowIter -column 3 -sticky w grid .myFrame.myChecks.myQt4Check -row $aCheckRowIter -column 4 -sticky e grid .myFrame.myChecks.myQt4Lbl -row $aCheckRowIter -column 5 -sticky w +if { "$::tcl_platform(platform)" == "windows" } { + grid .myFrame.myChecks.myD3dCheck -row $aCheckRowIter -column 6 -sticky e + grid .myFrame.myChecks.myD3dLbl -row $aCheckRowIter -column 7 -sticky w +} #grid .myFrame.myChecks.myOpenClCheck -row $aCheckRowIter -column 6 -sticky e #grid .myFrame.myChecks.myOpenClLbl -row $aCheckRowIter -column 7 -sticky w incr aCheckRowIter diff --git a/adm/genconfdeps.tcl b/adm/genconfdeps.tcl index c9a4a81c3c..e140abb0e1 100644 --- a/adm/genconfdeps.tcl +++ b/adm/genconfdeps.tcl @@ -46,6 +46,7 @@ set SHORTCUT_HEADERS "ShortCut" set HAVE_FREEIMAGE "false" set HAVE_GL2PS "false" set HAVE_TBB "false" +set HAVE_D3D "false" set HAVE_OPENCL "false" set HAVE_VTK "false" set MACOSX_USE_GLX "false" @@ -85,6 +86,9 @@ if { [info exists ::env(HAVE_GL2PS)] } { if { [info exists ::env(HAVE_TBB)] } { set HAVE_TBB "$::env(HAVE_TBB)" } +if { [info exists ::env(HAVE_D3D)] } { + set HAVE_D3D "$::env(HAVE_D3D)" +} if { [info exists ::env(HAVE_OPENCL)] } { set HAVE_OPENCL "$::env(HAVE_OPENCL)" } @@ -952,6 +956,7 @@ proc wokdep:SaveCustom {} { puts $aFile "set HAVE_FREEIMAGE=$::HAVE_FREEIMAGE" puts $aFile "set HAVE_GL2PS=$::HAVE_GL2PS" puts $aFile "set HAVE_TBB=$::HAVE_TBB" + puts $aFile "set HAVE_D3D=$::HAVE_D3D" puts $aFile "set HAVE_OPENCL=$::HAVE_OPENCL" puts $aFile "set HAVE_VTK=$::HAVE_VTK" puts $aFile "set CHECK_QT4=$::CHECK_QT4"