Merge branch 'master' into opengl

This commit is contained in:
ts-korhonen
2021-04-12 23:47:06 +03:00
24 changed files with 490 additions and 123 deletions

View File

@@ -447,7 +447,7 @@ else
UIOBJ := win_ui.o win_stbar.o \
win_sdl.o win_opengl.o glad.o \
win_dialog.o win_about.o \
win_settings.o win_devconf.o win_snd_gain.o \
win_settings.o win_devconf.o win_snd_gain.o win_specify_dim.o \
win_new_floppy.o win_jsconf.o win_media_menu.o
endif