OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into timidity++

Browse source 
# Conflicts:
#	src/sound/musicformats/music_midistream.cpp
This commit is contained in:
Christoph Oelckers 2018-03-02 00:08:12 +01:00
commit 4c0f68bcd4
41 changed files with 430 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/gameconfigfile.cpp
View file

@ -149,6 +149,7 @@ FGameConfigFile::FGameConfigFile ()
SetValueForKey ("Path", "$PROGDIR", true);
#else
SetValueForKey ("Path", "$HOME/" GAME_DIR, true);
SetValueForKey ("Path", SHARE_DIR, true);
SetValueForKey ("Path", "/usr/local/share/doom", true);
SetValueForKey ("Path", "/usr/local/share/games/doom", true);
SetValueForKey ("Path", "/usr/share/doom", true);