make MINGW=1 set SDL=1 by default, unless DIRECTX=1 was also set

This commit is contained in:
Monster Iestyn 2019-01-05 16:02:32 +00:00
parent e40110c1e8
commit 5ac187f81c
2 changed files with 6 additions and 2 deletions

View file

@ -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'

View file

@ -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