diff options
| author | Emil Velikov <[email protected]> | 2014-06-16 00:20:07 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-07-02 10:52:52 +0100 |
| commit | a66dd60547f928bb758ae94206a4a73541bfa2df (patch) | |
| tree | 469f91fffa39c13658394d5d11e9e9608d1a713a /src/gallium/state_trackers/dri/sw | |
| parent | 98204ea7d047f172bfaef3abb22a7aaef60efcda (diff) | |
st/dri: Allow separate dri-targets
With this commit we add a couple of DEFINES making the ST code
conditional, in a way that we can use it to gradually convert
the dri-targets from separate libraries into a single one.
Signed-off-by: Emil Velikov <[email protected]>
Tested-by: Rob Clark <[email protected]>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Acked-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/dri/sw')
| -rw-r--r-- | src/gallium/state_trackers/dri/sw/Makefile.am | 3 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/sw/SConscript | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/dri/sw/Makefile.am b/src/gallium/state_trackers/dri/sw/Makefile.am index 555ea171636..0cebd6df5fa 100644 --- a/src/gallium/state_trackers/dri/sw/Makefile.am +++ b/src/gallium/state_trackers/dri/sw/Makefile.am @@ -24,6 +24,9 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc AM_CPPFLAGS = \ + $(GALLIUM_PIPE_LOADER_DEFINES) \ + -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \ + -DSPLIT_TARGETS=1 \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/gallium/state_trackers/dri/common \ diff --git a/src/gallium/state_trackers/dri/sw/SConscript b/src/gallium/state_trackers/dri/sw/SConscript index 6d482a5bc94..5a71b2246f0 100644 --- a/src/gallium/state_trackers/dri/sw/SConscript +++ b/src/gallium/state_trackers/dri/sw/SConscript @@ -14,6 +14,7 @@ env.Append(CPPPATH = [ ]) env.Append(CPPDEFINES = [('__NOT_HAVE_DRM_H', '1')]) +env.Append(CPPDEFINES = [('SPLIT_TARGETS', '1')]) st_drisw = env.ConvenienceLibrary( target = 'st_drisw', |