stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-27 19:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Sally Coolatta 2021-02-27 00:38:43 -05:00
commit ffec5f632b
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/sdl/i_video.c
View file

@ -624,7 +624,6 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
// Tell game we got focus back, resume music if necessary // Tell game we got focus back, resume music if necessary
window_notinfocus = false; window_notinfocus = false;
if (!paused)
S_InitMusicVolume(); S_InitMusicVolume();
if (cv_gamesounds.value) if (cv_gamesounds.value)

4
src/win32/Makefile.cfg
View file

@ -164,3 +164,7 @@ else
endif endif
LIBS+=-ldiscord-rpc LIBS+=-ldiscord-rpc
endif endif
ifndef MINGW64
LDFLAGS+=-Wl,--large-address-aware
endif