mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-16 01:21:17 +00:00
- moved the menu.h include from oalsound.h to oalsound.cpp.
The menu is a very 'dirty' header, and forcing it to be pulled in with something entirely unrelated is not good - even though only two files include oalsound.h. # Conflicts: # src/sound/i_sound.cpp
This commit is contained in:
parent
0e7b96681a
commit
eebdd6c1bd
3 changed files with 3 additions and 1 deletions
|
@ -59,6 +59,8 @@
|
|||
#include "s_sound.h"
|
||||
#include "v_text.h"
|
||||
#include "gi.h"
|
||||
#include "c_cvars.h"
|
||||
#include "stats.h"
|
||||
|
||||
#include "doomdef.h"
|
||||
|
||||
|
|
|
@ -51,6 +51,7 @@
|
|||
#include "i_music.h"
|
||||
#include "i_musicinterns.h"
|
||||
#include "cmdlib.h"
|
||||
#include "menu/menu.h"
|
||||
|
||||
FModule OpenALModule{"OpenAL"};
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
|
||||
#include "i_sound.h"
|
||||
#include "s_sound.h"
|
||||
#include "menu/menu.h"
|
||||
|
||||
#ifndef NO_OPENAL
|
||||
|
||||
|
|
Loading…
Reference in a new issue