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

Merge branch 'master' into audio

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-01-15 19:38:56 -05:00
parent aaf535b404 939a701836
commit ffc89a99eb
45 changed files with 652 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/win/Makefile.mingw
View File

@@ -692,7 +692,7 @@ UIOBJ := win_ui.o win_icon.o win_stbar.o win_discord.o \
win_dialog.o win_about.o \
win_settings.o win_devconf.o win_snd_gain.o win_specify_dim.o win_preferences.o \
win_new_floppy.o win_jsconf.o \
win_media_menu.o
win_media_menu.o win_toolbar.o
ifeq ($(DINPUT), y)
PLATOBJ += win_joystick.o