diff options
| author | Eric Engestrom <[email protected]> | 2017-11-21 15:07:11 +0000 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2017-11-23 09:44:16 +0000 |
| commit | d16af7355900703514d95411b222e6e028252d66 (patch) | |
| tree | 49767268096b5a811382b9d87da77153a810332b | |
| parent | ab0809e5529725bd0af6f7b6ce06415020b9d32e (diff) | |
meson: reorder subdirs to avoid directly including more than one level
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
| -rw-r--r-- | src/mapi/glapi/meson.build | 2 | ||||
| -rw-r--r-- | src/mapi/meson.build | 2 | ||||
| -rw-r--r-- | src/meson.build | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build index f2012644785..14ffa68ad0d 100644 --- a/src/mapi/glapi/meson.build +++ b/src/mapi/glapi/meson.build @@ -18,6 +18,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +subdir('gen') + inc_glapi = include_directories('.') static_glapi_files = [] diff --git a/src/mapi/meson.build b/src/mapi/meson.build index ce94ee4b27a..afdde3dd8cc 100644 --- a/src/mapi/meson.build +++ b/src/mapi/meson.build @@ -25,10 +25,10 @@ files_mapi_util = files( 'u_execmem.h', ) +subdir('glapi') if with_shared_glapi subdir('shared-glapi') endif -subdir('glapi') if with_gles1 subdir('es1api') endif diff --git a/src/meson.build b/src/meson.build index 00bbaa8989c..db36866df63 100644 --- a/src/meson.build +++ b/src/meson.build @@ -45,7 +45,6 @@ sha1_h = custom_target( subdir('gtest') subdir('util') -subdir('mapi/glapi/gen') subdir('mapi') # TODO: opengl subdir('compiler') |