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

Merge branch 'master' into experimental

Browse Source
This commit is contained in:
Melissa Goad
2017-05-18 13:17:44 -05:00
parent 3568cc7afb a4a69f71eb
commit 1b15d1416e
75 changed files with 637 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Makefile.mingw
View File

@@ -8,7 +8,7 @@
#
# Modified Makefile for Win32 MinGW 32-bit environment.
#
# Version: @(#)Makefile.mingw 1.0.12 2017/05/12
# Version: @(#)Makefile.mingw 1.0.13 2017/05/17
#
# Authors: Kotori, <oubattler@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com>
@@ -29,20 +29,24 @@ STUFF = -DDEV_BRANCH
EXTRAS =
# Do we want a debugging build?
DEBUG = n
DEBUG = y
OPTIM = n
X64 = n
# Where is the WinPcap DLL ?
PCAPDLL = C:\\Windows\\System32\\wpcap.dll
#########################################################################
# Nothing should need changing from here on.. #
#########################################################################
VPATH = . cpu sound sound/resid-fp video lzf slirp
VPATH = . cpu sound sound/resid-fp video lzf slirp win
PLAT = win/
CPP = g++.exe
CC = gcc.exe
WINDRES = windres.exe
OPTS = -DWIN32 $(EXTRAS) $(STUFF)
OPTS = -DWIN32 -I$(PLAT) $(EXTRAS) $(STUFF)
ifeq ($(DEBUG), y)
ifeq ($(VRAMDUMP), y)
DFLAGS = -march=i686 -ggdb -DDEBUG -DENABLE_VRAM_DUMP
@@ -129,7 +133,7 @@ DEVOBJ = bugger.o lpt.o serial.o \
disc_86f.o disc_fdi.o disc_imd.o disc_img.o \
disc_random.o disc_td0.o \
cdrom.o \
cdrom-dosbox.o cdrom-image.o cdrom-ioctl.o cdrom-null.o
cdrom_dosbox.o cdrom_image.o cdrom_ioctl.o cdrom_null.o
USBOBJ = usb.o
NETOBJ = network.o \
net_pcap.o net_slirp.o \
@@ -174,12 +178,12 @@ VIDOBJ = video.o \
vid_pc1512.o vid_pc1640.o vid_pc200.o \
vid_tandy.o vid_tandysl.o
WINOBJ = win.o \
win-d3d.o win-d3d-fs.o \
win-ddraw.o win-ddraw-fs.o win-ddraw-screenshot.o \
win-language.o win-status.o win-opendir.o \
win-video.o win-serial.o win-mouse.o \
win-joystick.o win-midi.o \
win-settings.o win-deviceconfig.o win-joystickconfig.o \
win_d3d.o win_d3d-fs.o \
win_ddraw.o win_ddraw-fs.o win_ddraw-screenshot.o \
win_language.o win_status.o win_opendir.o \
win_video.o win_serial.o win_mouse.o \
win_joystick.o win_midi.o \
win_settings.o win_deviceconfig.o win_joystickconfig.o \
86Box.res
OBJ = $(MAINOBJ) $(CPUOBJ) $(SYSOBJ) $(DEVOBJ) $(USBOBJ) \
$(NETOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) $(WINOBJ)
@@ -197,7 +201,7 @@ LIBS = -mwindows -lcomctl32 -lwinmm -lopenal.dll -lopenal -lddraw \
# Build rules.
%.o: %.c
@echo $<
@$(CC) $(CFLAGS) -c $<
$(CC) $(CFLAGS) -c $<
%.o: %.cc
@echo $<
@@ -236,11 +240,15 @@ clean:
86Box.res: 86Box.rc
@echo Processing $<
@$(WINDRES) $(RFLAGS) -i 86Box.rc -o 86Box.res
@$(WINDRES) $(RFLAGS) -i win/86Box.rc -o 86Box.res
libwpcapdelay.a: $(PCAPDLL)
@dlltool --export-all-symbols --output-def wpcap.def $(PCAPDLL)
@dlltool --def wpcap.def --output-delaylib libwpcapdelay.a
pcap_if.res: pcap_if.rc
@echo Processing $<
@$(WINDRES) $(RFLAGS) -i pcap_if.rc -o pcap_if.res
@$(WINDRES) $(RFLAGS) -i win/pcap_if.rc -o pcap_if.res
# End of Makefile.mingw.