From bd61f216c8999866b283fdf70fd15dc90ed2f967 Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 13 Nov 2020 17:30:23 -0800 Subject: [PATCH 1/2] Always unmute music on refocus If the game is paused, music will be resumed when unpause anyway. --- src/sdl/i_video.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index 2858e9b6f..ba0f7f1df 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -624,8 +624,7 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt) // Tell game we got focus back, resume music if necessary window_notinfocus = false; - if (!paused) - S_InitMusicVolume(); + S_InitMusicVolume(); if (cv_gamesounds.value) S_EnableSound(); From 742a665481a8283f1b930233eeb212b07e391e51 Mon Sep 17 00:00:00 2001 From: himie Date: Tue, 14 Jul 2020 14:38:20 -0500 Subject: [PATCH 2/2] Add large address aware flag This allows the final exe to use more than 2gb of RAM in a 64-bit system which should get rid of most out of memory errors on 32-bit builds --- src/win32/Makefile.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/win32/Makefile.cfg b/src/win32/Makefile.cfg index e9e18280b..6286a18bf 100644 --- a/src/win32/Makefile.cfg +++ b/src/win32/Makefile.cfg @@ -164,3 +164,7 @@ else endif LIBS+=-ldiscord-rpc endif + +ifndef MINGW64 + LDFLAGS+=-Wl,--large-address-aware +endif