From b699465ca96070557feb9e69b898ddb0d4dca2dc Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Fri, 15 Jul 2022 17:45:32 -0700 Subject: build: always build the rototiller bin Now that there's the mem_fb backend, there's no need to disable producing a rototiller binary in lieu of libdrm and libsdl2. This commit also rejiggers some of the DEFAULT_VIDEO junk in main.c to ensure it falls back on "mem" should there be no drm or sdl2. For now I'm going to leave the AM_CONDITIONAL junk surrounding enabling rototiller in configure.ac, the define can just be ignored for now. --- src/main.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index c22eb3c..38a99d0 100644 --- a/src/main.c +++ b/src/main.c @@ -27,11 +27,22 @@ * another page so we can begin rendering another frame before vsync. With * just two pages we end up twiddling thumbs until the vsync arrives. */ + +#ifndef DEFAULT_VIDEO #ifdef HAVE_SDL #define DEFAULT_VIDEO "sdl" -#else +#endif +#endif + +#ifndef DEFAULT_VIDEO +#ifdef HAVE_DRM #define DEFAULT_VIDEO "drm" #endif +#endif + +#ifndef DEFAULT_VIDEO +#define DEFAULT_VIDEO "mem" +#endif extern til_fb_ops_t drm_fb_ops; extern til_fb_ops_t mem_fb_ops; -- cgit v1.2.1