claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged Direct3D modules, cleanup.

Browse Source 
Re-enabled optional CRASHDUMP module (CRASHDUMP=y in Makefile[.local]
This commit is contained in:
waltje
2017-11-13 02:06:00 -05:00
parent eb5bc68635
commit 0f66f0ce1f
11 changed files with 573 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/win/Makefile.mingw
View File

@@ -8,7 +8,7 @@
#
# Makefile for Win32 (MinGW32) environment.
#
# Version: @(#)Makefile.mingw 1.0.75 2017/11/12
# Version: @(#)Makefile.mingw 1.0.76 2017/11/12
#
# Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com>
@@ -33,6 +33,9 @@ endif
ifndef AUTODEP
AUTODEP := n
endif
ifndef CRASHDUMP
CRASHCUMP := n
endif
ifndef DEBUG
DEBUG := n
endif
@@ -159,6 +162,9 @@ AFLAGS := -msse -msse2 -mfpmath=sse
CFLAGS := $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) $(AFLAGS) \
-fomit-frame-pointer -mstackrealign -Wall
RFLAGS := --input-format=rc -O coff
ifeq ($(CRASHDUMP), y)
CFLAGS += -DUSE_CRASHDUMP
endif
ifeq ($(RELEASE), y)
CFLAGS += -DRELEASE_BUILD
RFLAGS += -DRELEASE_BUILD
@@ -378,10 +384,10 @@ VIDOBJ := video.o \
vid_voodoo.o
PLATOBJ := win.o \
win_ddraw.o win_d3d.o win_d3d_fs.o win_png.o \
win_crashdump.o win_ddraw.o win_d3d.o win_png.o \
win_dynld.o win_thread.o $(WSERIAL) win_video.o \
win_cdrom.o win_cdrom_ioctl.o win_keyboard.o win_mouse.o \
win_joystick.o win_midi.o \
win_cdrom.o win_cdrom_ioctl.o win_keyboard.o \
win_mouse.o win_joystick.o win_midi.o \
win_dialog.o win_about.o win_status.o win_stbar.o \
win_settings.o win_deviceconfig.o win_joystickconfig.o