From 5ac187f81c9fa30e0e803cf3c7c0e0cd7197174d Mon Sep 17 00:00:00 2001 From: Monster Iestyn Date: Sat, 5 Jan 2019 16:02:32 +0000 Subject: [PATCH] make MINGW=1 set SDL=1 by default, unless DIRECTX=1 was also set --- src/Makefile | 4 ++-- src/Makefile.cfg | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index c894203a4..f0b0e3a7c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,8 +15,8 @@ # # Sets: # Compile the DGJPP/DOS version with 'make WATTCP=1' -# Compile the DirectX/Mingw version with 'make MINGW=1' -# Compile the SDL/Mingw version with 'make MINGW=1 SDL=1' +# Compile the DirectX/Mingw version with 'make MINGW=1 DIRECTX=1' +# Compile the SDL/Mingw version with 'make MINGW=1' # Compile the SDL/Linux version with 'make LINUX=1' # Compile the SDL/Solaris version with 'make SOLARIS=1' # Compile the SDL/FreeBSD version with 'gmake FREEBSD=1' diff --git a/src/Makefile.cfg b/src/Makefile.cfg index 3f624b74e..53e567a43 100644 --- a/src/Makefile.cfg +++ b/src/Makefile.cfg @@ -368,6 +368,10 @@ ifdef PS3N else ifdef MINGW INTERFACE=win32 +#Use SDL by default, unless we want DirectX for srb2dd.exe +ifndef DIRECTX + SDL=1 +endif ifdef MINGW64 #NASMFORMAT=win64 OBJDIR:=$(OBJDIR)/Mingw64