summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2015-10-14 23:32:58 +0100
committerEmil Velikov <[email protected]>2015-11-21 12:52:20 +0000
commit234b03cc2378fbb4375fc2635fe3eeab85840d38 (patch)
tree7b3e820b3671368b25e84d99e9d51165f0d22df3
parent7999e6ddba38016964cbc33b98b4658e900bcd3c (diff)
pipe-loader: add preliminary scons support
Add a 'static' pipe-loader build, which will be used with follow-up commits. Signed-off-by: Emil Velikov <[email protected]> Acked-by: Rob Clark <[email protected]>
-rw-r--r--src/gallium/SConscript1
-rw-r--r--src/gallium/auxiliary/pipe-loader/Makefile.am2
-rw-r--r--src/gallium/auxiliary/pipe-loader/SConscript34
3 files changed, 37 insertions, 0 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index fa5fa6e8734..0c3a3742c16 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -5,6 +5,7 @@ Import('env')
#
SConscript('auxiliary/SConscript')
+SConscript('auxiliary/pipe-loader/SConscript')
#
# Drivers
diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.am b/src/gallium/auxiliary/pipe-loader/Makefile.am
index 6a4a667ab0f..f661897fdf7 100644
--- a/src/gallium/auxiliary/pipe-loader/Makefile.am
+++ b/src/gallium/auxiliary/pipe-loader/Makefile.am
@@ -44,3 +44,5 @@ libpipe_loader_dynamic_la_LIBADD = \
$(top_builddir)/src/loader/libloader.la
endif
+
+EXTRA_DIST = SConscript
diff --git a/src/gallium/auxiliary/pipe-loader/SConscript b/src/gallium/auxiliary/pipe-loader/SConscript
new file mode 100644
index 00000000000..393b6021bee
--- /dev/null
+++ b/src/gallium/auxiliary/pipe-loader/SConscript
@@ -0,0 +1,34 @@
+Import('*')
+
+env = env.Clone()
+
+env.MSVC2008Compat()
+
+env.Append(CPPPATH = [
+ '#/src/loader',
+ '#/src/gallium/winsys',
+])
+
+env.Append(CPPDEFINES = [
+ ('HAVE_PIPE_LOADER_DRI', '1'),
+ ('DROP_PIPE_LOADER_MISC', '1'),
+ ('GALLIUM_STATIC_TARGETS', '1'),
+])
+
+source = env.ParseSourceList('Makefile.sources', 'COMMON_SOURCES')
+
+#if HAVE_LIBDRM
+source += env.ParseSourceList('Makefile.sources', 'DRM_SOURCES')
+
+env.PkgUseModules('DRM')
+env.Append(LIBS = [libloader])
+#endif
+
+pipe_loader = env.ConvenienceLibrary(
+ target = 'pipe_loader',
+ source = source,
+)
+
+env.Alias('pipe_loader', pipe_loader)
+
+Export('pipe_loader')