projects
/
occt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0032308: Configuration - make Xlib dependency optional
[occt.git]
/
adm
/
genproj.tcl
diff --git
a/adm/genproj.tcl
b/adm/genproj.tcl
index
f12905f
..
ab61180
100644
(file)
--- a/
adm/genproj.tcl
+++ b/
adm/genproj.tcl
@@
-1491,7
+1491,11
@@
proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap theRelease} {
}
} else {
set aLibsMap(CSF_dl) "dl"
}
} else {
set aLibsMap(CSF_dl) "dl"
- set aLibsMap(CSF_OpenGlLibs) "GL"
+ if { "$::HAVE_XLIB" == "true" } {
+ set aLibsMap(CSF_OpenGlLibs) "GL"
+ } else {
+ set aLibsMap(CSF_OpenGlLibs) "GL EGL"
+ }
set aLibsMap(CSF_OpenGlesLibs) "EGL GLESv2"
if { "$theOS" == "mac" || "$theOS" == "ios" } {
set aLibsMap(CSF_objc) "objc"
set aLibsMap(CSF_OpenGlesLibs) "EGL GLESv2"
if { "$theOS" == "mac" || "$theOS" == "ios" } {
set aLibsMap(CSF_objc) "objc"
@@
-1525,8
+1529,10
@@
proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap theRelease} {
if { "$::HAVE_TK" == "true" } {
set aLibsMap(CSF_TclTkLibs) "tk8.6"
}
if { "$::HAVE_TK" == "true" } {
set aLibsMap(CSF_TclTkLibs) "tk8.6"
}
- set aLibsMap(CSF_XwLibs) "X11 Xext Xmu Xi"
- set aLibsMap(CSF_MotifLibs) "X11"
+ if { "$::HAVE_XLIB" == "true" } {
+ set aLibsMap(CSF_XwLibs) "X11 Xext Xmu Xi"
+ set aLibsMap(CSF_MotifLibs) "X11"
+ }
}
}
}
}
}
}