0023885: Inclusion of X11 header should be protected with macro

Paths to X11 libs adds only if option MACOSX_USE_GLX=true

diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl
index 7cca4a8acb783980b844f1003cfcbc04520b2fc0..00ca949b6aa37fc88f200371b70de813302eab31 100755 (executable)
--- a/src/WOKTclLib/osutils.tcl
+++ b/src/WOKTclLib/osutils.tcl
@@ -2935,7 +2935,9 @@ proc osutils:xcdtk { theOutDir theToolKit theGuidsMap {theTargetType "dylib"} }
   }
   puts $aPbxprojFile "\t\t\t\t\t\"\$(CSF_OPT_INC)\","
   puts $aPbxprojFile "\t\t\t\t);"
-  puts $aPbxprojFile "\t\t\t\tLIBRARY_SEARCH_PATHS = /usr/X11/lib;"
+  if { "$::MACOSX_USE_GLX" == "true" } {
+    puts $aPbxprojFile "\t\t\t\tLIBRARY_SEARCH_PATHS = /usr/X11/lib;"
+  }
   puts $aPbxprojFile "\t\t\t\tOTHER_CFLAGS = ("
   puts $aPbxprojFile "\t\t\t\t\t\"\$(CSF_OPT_CMPL)\","
   puts $aPbxprojFile "\t\t\t\t);"
@@ -2969,7 +2971,9 @@ proc osutils:xcdtk { theOutDir theToolKit theGuidsMap {theTargetType "dylib"} }
   }
   puts $aPbxprojFile "\t\t\t\t\t\"\$(CSF_OPT_INC)\","
   puts $aPbxprojFile "\t\t\t\t);"
-  puts $aPbxprojFile "\t\t\t\tLIBRARY_SEARCH_PATHS = /usr/X11/lib;"
+  if { "$::MACOSX_USE_GLX" == "true" } {
+    puts $aPbxprojFile "\t\t\t\tLIBRARY_SEARCH_PATHS = /usr/X11/lib;"
+  }
   puts $aPbxprojFile "\t\t\t\tOTHER_CFLAGS = ("
   puts $aPbxprojFile "\t\t\t\t\t\"\$(CSF_OPT_CMPL)\","
   puts $aPbxprojFile "\t\t\t\t);"

diff --git a/src/WOKTclLib/templates/codeblocks.sh b/src/WOKTclLib/templates/codeblocks.sh
index d888f5a523336c00f85db9abc3c7bf76a9405001..92f2ba2e0901acec1cdf569bb5e2ec28261c495d 100755 (executable)
--- a/src/WOKTclLib/templates/codeblocks.sh
+++ b/src/WOKTclLib/templates/codeblocks.sh
@@ -4,7 +4,4 @@ export TARGET="cbp"
 
 source ./env.sh "$TARGET" "$1"
 
-export CSF_OPT_LIB64="$CSF_OPT_LIB64:/usr/X11/lib"
-export CSF_OPT_LIB64D="$CSF_OPT_LIB64:/usr/X11/lib"
-
 /Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks ./adm/mac/cbp/OCCT.workspace

diff --git a/src/WOKTclLib/templates/xcode.sh b/src/WOKTclLib/templates/xcode.sh
index bb0bb685ec13e6dae91ba7979894566cb413b8a6..4bf107987add8951eb43eff8a9b4cb5334a2a81f 100755 (executable)
--- a/src/WOKTclLib/templates/xcode.sh
+++ b/src/WOKTclLib/templates/xcode.sh
@@ -4,7 +4,4 @@ export TARGET="xcd"
 
 source ./env.sh "$TARGET" "$1"
 
-export CSF_OPT_LIB64="$CSF_OPT_LIB64:/usr/X11/lib"
-export CSF_OPT_LIB64D="$CSF_OPT_LIB64:/usr/X11/lib"
-
 open -a Xcode ./adm/mac/xcd/OCCT.xcworkspace