Removes the legacy DirectDraw and Direct3D 9 renderers, and instead adds SDL (Hardware) and renames the existing SDL renderer to SDL (Software).

This commit is contained in:
OBattler
2019-12-05 00:51:07 +01:00
parent 743fafbc8e
commit 26c0a5d2ea
9 changed files with 128 additions and 233 deletions

View File

@@ -8,7 +8,7 @@
#
# Makefile for Win32 (MinGW32) environment.
#
# Version: @(#)Makefile.mingw 1.0.138 2019/10/23
# Version: @(#)Makefile.mingw 1.0.139 2019/12/05
#
# Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com>
@@ -369,7 +369,7 @@ ifneq ($(WX), n)
UIOBJ := wx_main.o wx_ui.o wx_stbar.o wx_render.o
else
UIOBJ := win_ui.o win_stbar.o \
win_ddraw.o win_d3d.o win_sdl.o \
win_sdl.o \
win_dialog.o win_about.o \
win_settings.o win_devconf.o win_snd_gain.o \
win_new_floppy.o win_jsconf.o
@@ -688,15 +688,8 @@ ifdef EXOBJ
OBJ += $(EXOBJ)
endif
LIBS := -mwindows \
-lddraw -ldxguid -ld3d9 \
-lcomctl32
ifeq ($(STATIC), y)
LIBS += -lopenal -lole32 -lwinmm
else
LIBS += -lwinmm -lopenal.dll
endif
LIBS := -mwindows -lcomctl32 \
-lopenal -lole32
ifeq ($(D2D), y)
LIBS += $(D2DLIB)
@@ -710,8 +703,7 @@ endif
ifneq ($(WX), n)
LIBS += $(WX_LIBS) -lm
endif
LIBS += -lpng -lz -lwsock32 -liphlpapi -ldinput8
LIBS += -static -lstdc++
LIBS += -lpng -lz -lwsock32 -liphlpapi -ldinput8 -lSDL2 -limm32 -lhid -lsetupapi -loleaut32 -lversion -lwinmm -static -lstdc++
ifneq ($(X64), y)
LIBS += -Wl,--large-address-aware
endif
@@ -719,9 +711,7 @@ ifneq ($(DINPUT), y)
LIBS += -lxinput
endif
ifeq ($(STATIC), y)
LIBS += -static
endif
# Build module rules.
ifeq ($(AUTODEP), y)