80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Properly moved the crash dump code to the Dev branch.

Browse Source
This commit is contained in:
OBattler
2018-01-28 18:18:06 +01:00
parent 9afad3999e
commit 8a161b2094
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/win/Makefile.mingw
View File

@@ -8,7 +8,7 @@
# #
# Makefile for Win32 (MinGW32) environment. # Makefile for Win32 (MinGW32) environment.
# #
# Version: @(#)Makefile.mingw 1.0.96 2018/01/28 # Version: @(#)Makefile.mingw 1.0.97 2018/01/28
# #
# Authors: Miran Grca, <mgrca8@gmail.com> # Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com> # Fred N. van Kempen, <decwiz@yahoo.com>
@@ -28,10 +28,6 @@ endif
ifndef AUTODEP ifndef AUTODEP
AUTODEP := n AUTODEP := n
endif endif
ifndef CRASHDUMP
CRASHDUMP := n
CRASHDUMPOBJ := win_crashdump.o
endif
ifndef DEBUG ifndef DEBUG
DEBUG := n DEBUG := n
endif endif
@@ -65,6 +61,9 @@ endif
ifndef CIRRUS ifndef CIRRUS
CIRRUS := n CIRRUS := n
endif endif
ifndef CRASHDUMP
CRASHDUMP := n
endif
ifndef GREENB ifndef GREENB
GREENB := n GREENB := n
endif endif
@@ -113,6 +112,7 @@ ifeq ($(DEV_BUILD), y)
DEBUG := y DEBUG := y
DEV_BRANCH := y DEV_BRANCH := y
CIRRUS := y CIRRUS := y
CRASHDUMP := y
GREENB := y GREENB := y
I686 := y I686 := y
LASERXT := y LASERXT := y
@@ -218,9 +218,6 @@ else
endif endif
AFLAGS := -msse -msse2 -mfpmath=sse AFLAGS := -msse -msse2 -mfpmath=sse
RFLAGS := --input-format=rc -O coff RFLAGS := --input-format=rc -O coff
ifeq ($(CRASHDUMP), y)
OPTS += -DUSE_CRASHDUMP
endif
ifeq ($(RELEASE), y) ifeq ($(RELEASE), y)
OPTS += -DRELEASE_BUILD OPTS += -DRELEASE_BUILD
RFLAGS += -DRELEASE_BUILD RFLAGS += -DRELEASE_BUILD
@@ -313,6 +310,11 @@ OPTS += -DUSE_CIRRUS
DEVBROBJ += vid_cl_gd.o vid_cl_gd_blit.o vid_cl_ramdac.o DEVBROBJ += vid_cl_gd.o vid_cl_gd_blit.o vid_cl_ramdac.o
endif endif
ifeq ($(CRASHDUMPOBJ), y)
OPTS += -DUSE_CRASHDUMP
DEVBROBJ += win_crashdump.o
endif
ifeq ($(GREENB), y) ifeq ($(GREENB), y)
OPTS += -DUSE_GREENB OPTS += -DUSE_GREENB
DEVBROBJ += m_at_4gpv31.o DEVBROBJ += m_at_4gpv31.o
@@ -485,7 +487,7 @@ VIDOBJ := video.o \
vid_voodoo.o vid_voodoo.o
PLATOBJ := win.o \ PLATOBJ := win.o \
$(CRASHDUMPOBJ) win_dynld.o win_thread.o $(WSERIAL) \ win_dynld.o win_thread.o \
win_cdrom.o win_cdrom_ioctl.o win_keyboard.o \ win_cdrom.o win_cdrom_ioctl.o win_keyboard.o \
win_mouse.o win_joystick.o win_midi.o win_mouse.o win_joystick.o win_midi.o