Merge branch 'master' into next

This commit is contained in:
Sally Coolatta committed 2021-02-27 00:38:43 -05:00
commit ffec5f632b
2 files changed
+5 -2

No files matched your search

+1 -2
View File
@@ -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();
+4
View File
@@ -164,3 +164,7 @@ else
endif
LIBS+=-ldiscord-rpc
endif
ifndef MINGW64
LDFLAGS+=-Wl,--large-address-aware
endif