Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
ThirdParty-common
Commits
45caecb8
Commit
45caecb8
authored
Jan 19, 2017
by
mark
Browse files
COMP: ensure GLES(1) includes are not installed with mesa
parent
705556c3
Changes
2
Hide whitespace changes
Inline
Side-by-side
BUILD.md
View file @
45caecb8
...
...
@@ -418,7 +418,7 @@ The minimum gcc/g++ requirements for building various components.
[
newer ParaView-52
]:
http://www.paraview.org/files/v5.2/ParaView-v5.2.0.tar.gz
[
page mesa
]:
http://mesa3d.org/
[
link mesa
]:
ftp://ftp.freedesktop.org/pub/mesa/13.0.
1
/mesa-13.0.
1
.tar.xz
[
link mesa
]:
ftp://ftp.freedesktop.org/pub/mesa/13.0.
3
/mesa-13.0.
3
.tar.xz
[
older mesa
]:
ftp://ftp.freedesktop.org/pub/mesa/11.2.2/mesa-11.2.2.tar.xz
[
page Qt
]:
https://www.qt.io/download-open-source/
...
...
makeMesa
View file @
45caecb8
...
...
@@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
# \\ / A nd | Copyright (C) 2016
-2017
OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
...
...
@@ -142,6 +142,15 @@ fi
MESA_SOURCE_DIR
=
$sourceBASE
/
$mesaPACKAGE
MESA_ARCH_PATH
=
$installBASE
/
$mesaPACKAGE
#
# Manual adjustments to mesa
# - avoid GLES (GLES1) since <GLES/gl.h> may mask the <GL/gl.h> header
adjustMESA
()
{
\r
m
-rf
$MESA_ARCH_PATH
/include/GLES
$MESA_ARCH_PATH
/include/GLES1
echo
"removed all gles1 includes"
}
(
# configuration options:
unset
configOpt
...
...
@@ -185,11 +194,13 @@ MESA_ARCH_PATH=$installBASE/$mesaPACKAGE
--disable-glx
\
--disable-dri
\
--disable-egl
\
--disable-gles1
\
--enable-texture-float
\
--enable-gallium-osmesa
--with-gallium-drivers
=
swrast
\
$configOpt
\
&&
make
-j
$WM_NCOMPPROCS
\
&&
make
install
\
&&
adjustMESA
\
&&
echo
"Built
$mesaPACKAGE
"
)
||
{
echo
"Error building: MESA"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment