From: dbv <dbv@opencascade.com>
Date: Tue, 9 Apr 2013 09:33:07 +0000 (+0400)
Subject: 0023885: Inclusion of X11 header should be protected with macro
X-Git-Tag: V6_7_1~48
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=d386aa84216f5a30760334717c45d0207ed3e3c0;p=occt-wok.git

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 7cca4a8..00ca949 100755
--- 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 d888f5a..92f2ba2 100755
--- 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 bb0bb68..4bf1079 100755
--- 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