/[Slicer3]/oldtrunk/slicer_variables.tcl
ViewVC logotype

Diff of /oldtrunk/slicer_variables.tcl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 10127 by pieper, Fri Jul 31 11:54:19 2009 UTC revision 10163 by pieper, Mon Aug 3 13:29:15 2009 UTC
# Line 210  switch $::tcl_platform(os) { Line 210  switch $::tcl_platform(os) {
210          set ::Teem_TEST_FILE $::Teem_BIN_DIR/unu          set ::Teem_TEST_FILE $::Teem_BIN_DIR/unu
211          set ::VTK_TEST_FILE $::VTK_DIR/bin/vtk          set ::VTK_TEST_FILE $::VTK_DIR/bin/vtk
212          set ::KWWidgets_TEST_FILE $::KWWidgets_BUILD_DIR/bin/libKWWidgets.so          set ::KWWidgets_TEST_FILE $::KWWidgets_BUILD_DIR/bin/libKWWidgets.so
213            set ::OpenCV_TEST_FILE $::OpenCV_DIR/lib/libcv.so
214          set ::VTK_TCL_LIB $::TCL_LIB_DIR/libtcl8.5.$shared_lib_ext          set ::VTK_TCL_LIB $::TCL_LIB_DIR/libtcl8.5.$shared_lib_ext
215          set ::VTK_TK_LIB $::TCL_LIB_DIR/libtk8.5.$shared_lib_ext          set ::VTK_TK_LIB $::TCL_LIB_DIR/libtk8.5.$shared_lib_ext
216          set ::VTK_TCLSH $::TCL_BIN_DIR/tclsh8.5          set ::VTK_TCLSH $::TCL_BIN_DIR/tclsh8.5
# Line 346  switch $::tcl_platform(os) { Line 347  switch $::tcl_platform(os) {
347  # System dependent variables  # System dependent variables
348    
349  switch $::tcl_platform(os) {  switch $::tcl_platform(os) {
350      "SunOS" {        "SunOS" {
351          set ::VTKSLICERBASE_BUILD_LIB $::Slicer3_HOME/Base/builds/$::env(BUILD)/bin/vtkSlicerBase.so          set ::VTKSLICERBASE_BUILD_LIB $::Slicer3_HOME/Base/builds/$::env(BUILD)/bin/vtkSlicerBase.so
352          set ::VTKSLICERBASE_BUILD_TCL_LIB $::Slicer3_HOME/Base/builds/$::env(BUILD)/bin/vtkSlicerBaseTCL.so          set ::VTKSLICERBASE_BUILD_TCL_LIB $::Slicer3_HOME/Base/builds/$::env(BUILD)/bin/vtkSlicerBaseTCL.so
353          set ::GENERATOR "Unix Makefiles"          set ::GENERATOR "Unix Makefiles"
# Line 381  switch $::tcl_platform(os) { Line 382  switch $::tcl_platform(os) {
382          } else {          } else {
383            set GETBUILDTEST(bitness) $GENLIB(bitness)            set GETBUILDTEST(bitness) $GENLIB(bitness)
384          }          }
385          if {$GETBUILDTEST(bitness) == "64" || $GENLIB(bitness) == "64"} {          if {$::GETBUILDTEST(bitness) == "64" || $::GENLIB(bitness) == "64"} {
386            set ::env(CFLAGS) -m64  
387            set ::env(CXXFLAGS) -m64            # Due to bug 6223255 on Solaris 10 we need to explicitly set the runtime path
388            set ::env(LDFLAGS) -m64            # for shared objects, because the linker will not find the 64 bit lib automatically.
389              # See the bellow link for more details:
390              # http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6223255
391              if {$tcl_platform(osVersion) == "5.10" && ($::GETBUILDTEST(bitness) == "64" || $::GENLIB(bitness) == "64")} {
392                set ::env(CFLAGS) -m64
393                set ::env(CXXFLAGS) -m64
394                set ::env(LDFLAGS) "-m64 -L/usr/sfw/lib/64 -R/usr/sfw/lib/64"
395    
396              } else {
397                set ::env(CFLAGS) -m64
398                set ::env(CXXFLAGS) -m64
399                set ::env(LDFLAGS) -m64
400              }
401          } else {          } else {
402            set ::env(CFLAGS) ""            set ::env(CFLAGS) ""
403            set ::env(CXXFLAGS) ""            set ::env(CXXFLAGS) ""

Legend:
Removed from v.10127  
changed lines
  Added in v.10163

  ViewVC Help
Powered by ViewVC 1.1.22