aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-18 09:21:27 +0100
committermarha <marha@users.sourceforge.net>2013-11-18 09:21:27 +0100
commit7c20de6c7fb53ed404d4df0d975328318810ce01 (patch)
tree8f837042966482fd961444153eabbc46cb9141eb /mesalib/src/mesa/drivers
parentaa095d69b3874eb179cb77f033109a7f8f351041 (diff)
downloadvcxsrv-7c20de6c7fb53ed404d4df0d975328318810ce01.tar.gz
vcxsrv-7c20de6c7fb53ed404d4df0d975328318810ce01.tar.bz2
vcxsrv-7c20de6c7fb53ed404d4df0d975328318810ce01.zip
libXext mesa xkeyboard-config pixman 18 nov 2013
xkeyboard-config commit 51ab5c95e48b2a040fc132bb5c1a5e8bbe86c8f4 libXext commit bb24f2970f2e425f4df90c9b73d078ad15a73fbb pixman commit f473fd1e7553a4e92a0d72bea360f05d005c9a88 mesa commit 2cfbf84dadc915b7075a3f1cbb569daf699d5ff0
Diffstat (limited to 'mesalib/src/mesa/drivers')
-rw-r--r--mesalib/src/mesa/drivers/SConscript5
-rw-r--r--mesalib/src/mesa/drivers/dri/common/Android.mk2
-rw-r--r--mesalib/src/mesa/drivers/dri/common/Makefile.am10
-rw-r--r--mesalib/src/mesa/drivers/dri/common/Makefile.sources8
-rw-r--r--mesalib/src/mesa/drivers/dri/common/SConscript83
5 files changed, 96 insertions, 12 deletions
diff --git a/mesalib/src/mesa/drivers/SConscript b/mesalib/src/mesa/drivers/SConscript
index 86aa868e5..9888e3306 100644
--- a/mesalib/src/mesa/drivers/SConscript
+++ b/mesalib/src/mesa/drivers/SConscript
@@ -6,7 +6,10 @@ if env['x11']:
SConscript('x11/SConscript')
if env['dri']:
- SConscript('dri/common/xmlpool/SConscript')
+ SConscript([
+ 'dri/common/xmlpool/SConscript',
+ 'dri/common/SConscript',
+ ])
if env['platform'] == 'windows':
SConscript('windows/gdi/SConscript')
diff --git a/mesalib/src/mesa/drivers/dri/common/Android.mk b/mesalib/src/mesa/drivers/dri/common/Android.mk
index b3dac29dd..0489a32de 100644
--- a/mesalib/src/mesa/drivers/dri/common/Android.mk
+++ b/mesalib/src/mesa/drivers/dri/common/Android.mk
@@ -40,7 +40,7 @@ LOCAL_C_INCLUDES := \
$(intermediates) \
$(MESA_DRI_C_INCLUDES)
-LOCAL_SRC_FILES := $(mesa_dri_common_SOURCES)
+LOCAL_SRC_FILES := $(DRI_COMMON_FILES)
LOCAL_GENERATED_SOURCES := \
$(intermediates)/xmlpool/options.h
diff --git a/mesalib/src/mesa/drivers/dri/common/Makefile.am b/mesalib/src/mesa/drivers/dri/common/Makefile.am
index 7f87ed6f5..e500bdb30 100644
--- a/mesalib/src/mesa/drivers/dri/common/Makefile.am
+++ b/mesalib/src/mesa/drivers/dri/common/Makefile.am
@@ -21,6 +21,8 @@
SUBDIRS = xmlpool
+include Makefile.sources
+
AM_CFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/ \
@@ -35,13 +37,9 @@ noinst_LTLIBRARIES = \
libmegadriver_stub.la \
libdri_test_stubs.la
-libdricommon_la_SOURCES = \
- utils.c \
- dri_util.c \
- xmlconfig.c
+libdricommon_la_SOURCES = $(DRI_COMMON_FILES)
-libdri_test_stubs_la_SOURCES = \
- dri_test.c
+libdri_test_stubs_la_SOURCES = $(test_stubs_FILES)
libdri_test_stubs_la_CFLAGS = $(AM_CFLAGS) -DNO_MAIN
libmegadriver_stub_la_SOURCES = megadriver_stub.c
diff --git a/mesalib/src/mesa/drivers/dri/common/Makefile.sources b/mesalib/src/mesa/drivers/dri/common/Makefile.sources
index 040b71725..8469b4950 100644
--- a/mesalib/src/mesa/drivers/dri/common/Makefile.sources
+++ b/mesalib/src/mesa/drivers/dri/common/Makefile.sources
@@ -1,11 +1,8 @@
-mesa_dri_common_gallium_SOURCES := \
+DRI_COMMON_FILES := \
utils.c \
dri_util.c \
xmlconfig.c
-mesa_dri_common_SOURCES := \
- $(mesa_dri_common_gallium_SOURCES)
-
# Paths are relative to MESA_TOP.
mesa_dri_common_INCLUDES := \
include \
@@ -14,3 +11,6 @@ mesa_dri_common_INCLUDES := \
src/mapi \
src/mesa \
src/mesa/drivers/dri/common
+
+test_stubs_FILES := \
+ dri_test.c
diff --git a/mesalib/src/mesa/drivers/dri/common/SConscript b/mesalib/src/mesa/drivers/dri/common/SConscript
new file mode 100644
index 000000000..8b15532e3
--- /dev/null
+++ b/mesalib/src/mesa/drivers/dri/common/SConscript
@@ -0,0 +1,83 @@
+###################################
+# SConcscript file for dri targets
+
+Import('*')
+
+drienv = env.Clone()
+
+drienv.Replace(CPPPATH = [
+ '#src/mesa/drivers/dri/common',
+ xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
+ '#include',
+ '#include/GL/internal',
+ '#src/mapi',
+ '#src/gallium/include',
+ '#src/gallium/auxiliary',
+ '#src/gallium/drivers',
+ '#src/gallium/winsys',
+ '#src/mesa',
+ '#src/mesa/main',
+ '#src/mesa/glapi',
+ '#src/mesa/math',
+ '#src/mesa/transform',
+ '#src/mesa/shader',
+ '#src/mesa/swrast',
+ '#src/mesa/swrast_setup',
+ '#src/egl/main',
+ '#src/egl/drivers/dri',
+])
+
+driswenv = drienv.Clone()
+driswenv.Append(CPPDEFINES = [
+ '__NOT_HAVE_DRM_H',
+])
+
+drienv.PkgUseModules('DRM')
+
+dri_common_utils = drienv.SharedObject(
+ target = 'utils.o',
+ source = '#src/mesa/drivers/dri/common/utils.c'
+)
+
+dri_common_xmlconfig = drienv.SharedObject(
+ target = 'xmlconfig.o',
+ source = '#src/mesa/drivers/dri/common/xmlconfig.c'
+)
+
+dri_common_dri_util = drienv.SharedObject(
+ target = 'dri_util.o',
+ source = '#src/mesa/drivers/dri/common/dri_util.c'
+)
+
+dri_common_drisw_util = driswenv.SharedObject(
+ target = 'drisw_util.o',
+ source = '#src/mesa/drivers/dri/common/dri_util.c'
+)
+
+
+COMMON_DRI_SW_OBJECTS = [
+ dri_common_utils,
+ dri_common_xmlconfig,
+ dri_common_drisw_util,
+]
+
+COMMON_DRI_DRM_OBJECTS = [
+ dri_common_utils,
+ dri_common_xmlconfig,
+ dri_common_dri_util,
+]
+
+drienv.AppendUnique(LIBS = [
+ 'expat',
+])
+
+driswenv.AppendUnique(LIBS = [
+ 'expat',
+])
+
+Export([
+ 'drienv',
+ 'driswenv',
+ 'COMMON_DRI_SW_OBJECTS',
+ 'COMMON_DRI_DRM_OBJECTS',
+])