diff options
| author | Eric Anholt <[email protected]> | 2015-11-21 13:07:42 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2015-11-22 13:15:40 -0800 |
| commit | a39eac80fd491abb990b0b77dd5e4adc5b9c53e1 (patch) | |
| tree | 88898be16e2612f20133ab8f62f2c34091aa6d19 | |
| parent | d1212abf505a468c9947a66dbf2d59acb4616e42 (diff) | |
vc4: Just put USE_VC4_SIMULATOR in DEFINES.
In the pipe-loader reworks, it was missed in one of the new directories it
was used.
Cc: [email protected]
Reviewed-by: Emil Velikov <[email protected]>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/Automake.inc | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/Makefile.am | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 91fdfe5f9cb..120c93e7e73 100644 --- a/configure.ac +++ b/configure.ac @@ -2173,7 +2173,9 @@ if test -n "$with_gallium_drivers"; then gallium_require_drm_loader PKG_CHECK_MODULES([SIMPENROSE], [simpenrose], - [USE_VC4_SIMULATOR=yes], [USE_VC4_SIMULATOR=no]) + [USE_VC4_SIMULATOR=yes; + DEFINES="$DEFINES -DUSE_VC4_SIMULATOR"], + [USE_VC4_SIMULATOR=no]) ;; xvirgl) HAVE_GALLIUM_VIRGL=yes diff --git a/src/gallium/drivers/vc4/Automake.inc b/src/gallium/drivers/vc4/Automake.inc index 6fa3e190cac..5664c2ab14e 100644 --- a/src/gallium/drivers/vc4/Automake.inc +++ b/src/gallium/drivers/vc4/Automake.inc @@ -6,8 +6,4 @@ TARGET_LIB_DEPS += \ $(top_builddir)/src/gallium/winsys/vc4/drm/libvc4drm.la \ $(top_builddir)/src/gallium/drivers/vc4/libvc4.la -if USE_VC4_SIMULATOR -TARGET_CPPFLAGS += -DUSE_VC4_SIMULATOR -endif - endif diff --git a/src/gallium/drivers/vc4/Makefile.am b/src/gallium/drivers/vc4/Makefile.am index f4a57ba3404..a3bf72fc72a 100644 --- a/src/gallium/drivers/vc4/Makefile.am +++ b/src/gallium/drivers/vc4/Makefile.am @@ -23,7 +23,6 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc if USE_VC4_SIMULATOR -SIM_CFLAGS = -DUSE_VC4_SIMULATOR=1 SIM_LDFLAGS = -lsimpenrose endif |