This builds ddebug, noop, rbug, and trace drivers.
Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
---
src/gallium/{ => drivers/ddebug}/meson.build | 13 ++++++++-----
src/gallium/{ => drivers/noop}/meson.build | 12 +++++++-----
src/gallium/{ => drivers/rbug}/meson.build | 13 ++++++++-----
src/gallium/{ => drivers/trace}/meson.build | 14 +++++++++-----
src/gallium/meson.build | 4 ++++
5 files changed, 36 insertions(+), 20 deletions(-)
copy src/gallium/{ => drivers/ddebug}/meson.build (79%)
copy src/gallium/{ => drivers/noop}/meson.build (82%)
copy src/gallium/{ => drivers/rbug}/meson.build (77%)
copy src/gallium/{ => drivers/trace}/meson.build (72%)
diff --git a/src/gallium/meson.build b/src/gallium/drivers/ddebug/meson.build
similarity index 79%
copy from src/gallium/meson.build
copy to src/gallium/drivers/ddebug/meson.build
index 50708d146fc..09ede3d04d4 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/drivers/ddebug/meson.build
@@ -18,8 +18,11 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-inc_gallium = include_directories('include')
-inc_gallium_winsys = include_directories('winsys')
-
-subdir('auxiliary')
-subdir('auxiliary/pipe-loader')
+libddebug = static_library(
+ 'ddebug',
+ files('dd_context.c', 'dd_draw.c', 'dd_pipe.h', 'dd_public.h', 'dd_screen.c',
+ 'dd_util.h'),
+ c_args : [c_vis_args],
+ include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux],
+ build_by_default : false,
+)
diff --git a/src/gallium/meson.build b/src/gallium/drivers/noop/meson.build
similarity index 82%
copy from src/gallium/meson.build
copy to src/gallium/drivers/noop/meson.build
index 50708d146fc..c4bb1508e3c 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/drivers/noop/meson.build
@@ -18,8 +18,10 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-inc_gallium = include_directories('include')
-inc_gallium_winsys = include_directories('winsys')
-
-subdir('auxiliary')
-subdir('auxiliary/pipe-loader')
+libnoop = static_library(
+ 'noop',
+ files('noop_pipe.c', 'noop_public.h', 'noop_state.c'),
+ c_args : [c_vis_args],
+ include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux],
+ build_by_default : false,
+)
diff --git a/src/gallium/meson.build b/src/gallium/drivers/rbug/meson.build
similarity index 77%
copy from src/gallium/meson.build
copy to src/gallium/drivers/rbug/meson.build
index 50708d146fc..9c74171f7b5 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/drivers/rbug/meson.build
@@ -18,8 +18,11 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-inc_gallium = include_directories('include')
-inc_gallium_winsys = include_directories('winsys')
-
-subdir('auxiliary')
-subdir('auxiliary/pipe-loader')
+librbug = static_library(
+ 'rbug',
+ files('rbug_context.c', 'rbug_context.h', 'rbug_core.c', 'rbug_objects.c',
+ 'rbug_objects.h', 'rbug_public.h', 'rbug_screen.c', 'rbug_screen.h'),
+ include_directories : [inc_gallium, inc_gallium_aux, inc_include, inc_src],
+ c_args : [c_vis_args],
+ build_by_default : false,
+)
diff --git a/src/gallium/meson.build b/src/gallium/drivers/trace/meson.build
similarity index 72%
copy from src/gallium/meson.build
copy to src/gallium/drivers/trace/meson.build
index 50708d146fc..4fc5d8ba0f6 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/drivers/trace/meson.build
@@ -18,8 +18,12 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-inc_gallium = include_directories('include')
-inc_gallium_winsys = include_directories('winsys')
-
-subdir('auxiliary')
-subdir('auxiliary/pipe-loader')
+libtrace = static_library(
+ 'trace',
+ files('tr_context.c', 'tr_context.h', 'tr_dump.c', 'tr_dump_defines.h',
+ 'tr_dump.h', 'tr_dump_state.c', 'tr_dump_state.h', 'tr_public.h',
+ 'tr_screen.c', 'tr_screen.h', 'tr_texture.c', 'tr_texture.h'),
+ c_args : [c_msvc_compat_args, c_vis_args],
+ include_directories : [inc_gallium, inc_gallium_aux, inc_include, inc_src],
+ build_by_default : false,
+)
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 50708d146fc..d69c3aeca39 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -23,3 +23,7 @@ inc_gallium_winsys = include_directories('winsys')
subdir('auxiliary')
subdir('auxiliary/pipe-loader')
+subdir('drivers/ddebug')
+subdir('drivers/noop')
+subdir('drivers/trace')
+subdir('drivers/rbug')
--
2.14.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
