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

Fix RtMidi on Makefile builds

Browse Source
This commit is contained in:
David Hrdlička
2022-03-11 21:19:59 +01:00
parent ae6cb77ac8
commit 7c20d7c5bb
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/win/Makefile.mingw
View File

@@ -191,6 +191,9 @@ endif
ifndef CPPTHREADS ifndef CPPTHREADS
CPPTHREADS := y CPPTHREADS := y
endif endif
ifndef RTMIDI
RTMIDI := y
endif
ifeq ($(DYNAREC), y) ifeq ($(DYNAREC), y)
ifeq ($(ARM), y) ifeq ($(ARM), y)
ifeq ($(NEW_DYNAREC), n) ifeq ($(NEW_DYNAREC), n)
@@ -650,7 +653,7 @@ SNDOBJ := sound.o \
wave6581_P_T.o wave6581_PS_.o wave6581_PST.o \ wave6581_P_T.o wave6581_PS_.o wave6581_PST.o \
wave8580__ST.o wave8580_P_T.o wave8580_PS_.o \ wave8580__ST.o wave8580_P_T.o wave8580_PS_.o \
wave8580_PST.o wave.o \ wave8580_PST.o wave.o \
midi.o midi_rtmidi.o \ midi.o \
snd_speaker.o \ snd_speaker.o \
snd_pssj.o \ snd_pssj.o \
snd_ps1.o \ snd_ps1.o \
@@ -747,7 +750,13 @@ ifdef EXOBJ
OBJ += $(EXOBJ) OBJ += $(EXOBJ)
endif endif
LIBS := -mwindows -lcomctl32 -lSDL2 -lrtmidi -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
ifeq ($(RTMIDI), y)
SNDOBJ += midi_rtmidi.o
OPTS += -DUSE_RTMIDI
LIBS += -lrtmidi
endif
ifeq ($(VNC), y) ifeq ($(VNC), y)
LIBS += $(VNCLIB) -lws2_32 LIBS += $(VNCLIB) -lws2_32