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

Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

Browse Source
This commit is contained in:
RichardG867
2022-07-08 19:22:52 -03:00
parent 50b75c457d 95c264d98e
commit 9bdec4a1d9
101 changed files with 224686 additions and 859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/win/Makefile.mingw
View File

@@ -71,7 +71,7 @@ ifeq ($(DEV_BUILD), y)
OPEN_AT := y
endif
ifndef PAS16
PAS16 := n
PAS16 := y
endif
ifndef SIO_DETECT
SIO_DETECT := y
@@ -173,14 +173,17 @@ endif
ifndef DINPUT
DINPUT := n
endif
ifndef FAUDIO
FAUDIO := n
endif
ifndef OPENAL
OPENAL := n
OPENAL := n
endif
ifndef FLUIDSYNTH
FLUIDSYNTH := y
FLUIDSYNTH := y
endif
ifndef MUNT
MUNT := y
MUNT := y
endif
ifndef VNC
VNC := n
@@ -715,7 +718,8 @@ VIDOBJ := agpgart.o video.o \
vid_ibm_rgb528_ramdac.o vid_sdac_ramdac.o \
vid_ogc.o \
vid_nga.o \
vid_tvp3026_ramdac.o
vid_tvp3026_ramdac.o \
vid_xga.o
VOODOOOBJ := vid_voodoo.o vid_voodoo_banshee.o \
vid_voodoo_banshee_blitter.o \
@@ -746,6 +750,9 @@ endif
ifeq ($(OPENAL), y)
SNDOBJ += openal.o
else
ifeq ($(FAUDIO), y)
OPTS += -DUSE_FAUDIO
endif
SNDOBJ += xaudio2.o
endif
@@ -757,7 +764,11 @@ ifdef EXOBJ
OBJ += $(EXOBJ)
endif
ifeq ($(OPENAL), y)
LIBS := -mwindows -lopenal -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid
else
LIBS := -mwindows -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid
endif
ifeq ($(RTMIDI), y)
SNDOBJ += midi_rtmidi.o