AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-25 05:48:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/fabiangreffrath/woof

Browse Source
This commit is contained in:
Roman Fomin 2023-04-11 23:51:02 +07:00
commit bca805ed7b
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/win_msvc.yml vendored
View File

@ -5,8 +5,8 @@ on:
branches: [ master ] branches: [ master ]
tags: ['*'] tags: ['*']
paths-ignore: ['**.md'] paths-ignore: ['**.md']
pull_request: # pull_request:
branches: [ master ] # branches: [ master ]
env: env:
VCPKG_ROOT: C:\vcpkg VCPKG_ROOT: C:\vcpkg

2
CMakeLists.txt
View File

@ -92,6 +92,7 @@ configure_file(config.h.in config.h)
if(WIN32) if(WIN32)
install(FILES COPYING DESTINATION .) install(FILES COPYING DESTINATION .)
install(FILES README.md DESTINATION .) install(FILES README.md DESTINATION .)
install(FILES data/alsoft DESTINATION . RENAME alsoft.ini)
install(DIRECTORY docs/ DESTINATION docs) install(DIRECTORY docs/ DESTINATION docs)
install(DIRECTORY examples/ DESTINATION docs/examples) install(DIRECTORY examples/ DESTINATION docs/examples)
install(DIRECTORY autoload/ DESTINATION autoload) install(DIRECTORY autoload/ DESTINATION autoload)
@ -101,6 +102,7 @@ if(WIN32)
else() else()
install(FILES COPYING DESTINATION "share/doc/${PROJECT_SHORTNAME}") install(FILES COPYING DESTINATION "share/doc/${PROJECT_SHORTNAME}")
install(FILES README.md DESTINATION "share/doc/${PROJECT_SHORTNAME}") install(FILES README.md DESTINATION "share/doc/${PROJECT_SHORTNAME}")
install(FILES data/alsoft DESTINATION "share/${PROJECT_SHORTNAME}" RENAME alsoft.conf)
install(DIRECTORY autoload/ DESTINATION "share/${PROJECT_SHORTNAME}/autoload") install(DIRECTORY autoload/ DESTINATION "share/${PROJECT_SHORTNAME}/autoload")
if(EXISTS "${CMAKE_SOURCE_DIR}/docs") if(EXISTS "${CMAKE_SOURCE_DIR}/docs")
install(DIRECTORY docs/ DESTINATION "share/doc/${PROJECT_SHORTNAME}") install(DIRECTORY docs/ DESTINATION "share/doc/${PROJECT_SHORTNAME}")

3
data/alsoft Normal file
View File

@ -0,0 +1,3 @@
# OpenAL configuration. More options at
# https://github.com/kcat/openal-soft/blob/master/alsoftrc.sample
resampler = linear

7
src/i_sound.c
View File

@ -549,13 +549,17 @@ void I_InitSound(void)
ALCdevice *device; ALCdevice *device;
ALCcontext *context; ALCcontext *context;
if (nosfxparm) if (nosfxparm && nomusicparm)
{ {
return; return;
} }
printf("I_InitSound: "); printf("I_InitSound: ");
#ifdef WOOFDATADIR
setenv("ALSOFT_CONF", WOOFDATADIR"/alsoft.conf", 0);
#endif
name = alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER); name = alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
device = alcOpenDevice(name); device = alcOpenDevice(name);
@ -585,6 +589,7 @@ void I_InitSound(void)
snd_init = true; snd_init = true;
// [FG] precache all sound effects // [FG] precache all sound effects
if (!nosfxparm)
{ {
int i; int i;