From 5fba6e760773c91fb48924c4419af55e0151bfb9 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Sat, 22 Oct 2016 01:31:29 -0700 Subject: [PATCH] makefile: Use libSDL when building simulators using display library with MinGW --- makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/makefile b/makefile index 8b7d67fa..db53d661 100644 --- a/makefile +++ b/makefile @@ -812,9 +812,13 @@ else ifneq (,$(VIDEO_USEFUL)) SDL_INCLUDE = $(word 1,$(shell dir /b /s ..\windows-build\libSDL\SDL.h)) ifeq (SDL.h,$(findstring SDL.h,$(SDL_INCLUDE))) - VIDEO_CCDEFS += -DHAVE_LIBSDL -I$(abspath $(dir $(SDL_INCLUDE))) + $(info using libSDL2: $(abspath $(SDL_INCLUDE))) + VIDEO_CCDEFS += -DHAVE_LIBSDL -DUSE_SIM_VIDEO -I$(abspath $(dir $(SDL_INCLUDE))) VIDEO_LDFLAGS += -lSDL2 -L$(abspath $(dir $(SDL_INCLUDE))\..\lib) VIDEO_FEATURES = - video capabilities provided by libSDL2 (Simple Directmedia Layer) + DISPLAYL = ${DISPLAYD}/display.c $(DISPLAYD)/sim_ws.c + DISPLAYVT = ${DISPLAYD}/vt11.c + DISPLAY_OPT += -DUSE_DISPLAY $(VIDEO_CCDEFS) $(VIDEO_LDFLAGS) else $(info ***********************************************************************) $(info ***********************************************************************)