Fixed building with FAudio using Makefile.mingw.
This commit is contained in:
@@ -423,6 +423,10 @@ RFLAGS += -DMTR_ENABLED
|
|||||||
MINITRACEOBJ := minitrace.o
|
MINITRACEOBJ := minitrace.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(FAUDIO), y)
|
||||||
|
OPTS += -DUSE_FAUDIO
|
||||||
|
endif
|
||||||
|
|
||||||
# Options for the DEV branch.
|
# Options for the DEV branch.
|
||||||
ifeq ($(DEV_BRANCH), y)
|
ifeq ($(DEV_BRANCH), y)
|
||||||
OPTS += -DDEV_BRANCH
|
OPTS += -DDEV_BRANCH
|
||||||
@@ -750,9 +754,6 @@ endif
|
|||||||
ifeq ($(OPENAL), y)
|
ifeq ($(OPENAL), y)
|
||||||
SNDOBJ += openal.o
|
SNDOBJ += openal.o
|
||||||
else
|
else
|
||||||
ifeq ($(FAUDIO), y)
|
|
||||||
OPTS += -DUSE_FAUDIO
|
|
||||||
endif
|
|
||||||
SNDOBJ += xaudio2.o
|
SNDOBJ += xaudio2.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -767,8 +768,12 @@ endif
|
|||||||
ifeq ($(OPENAL), y)
|
ifeq ($(OPENAL), y)
|
||||||
LIBS := -mwindows -lopenal -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid
|
LIBS := -mwindows -lopenal -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid
|
||||||
else
|
else
|
||||||
|
ifeq ($(FAUDIO), y)
|
||||||
|
LIBS := -mwindows -lfaudio -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
|
LIBS := -mwindows -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(RTMIDI), y)
|
ifeq ($(RTMIDI), y)
|
||||||
SNDOBJ += midi_rtmidi.o
|
SNDOBJ += midi_rtmidi.o
|
||||||
|
Reference in New Issue
Block a user