mirror of
https://github.com/nillerusr/source-engine.git
synced 2024-12-22 06:06:50 +00:00
engine/audio: fix build
This commit is contained in:
nillerusr
parent
a68d5d8633
commit
bca0ae8c59
@ -19,7 +19,7 @@
|
||||
#include "eax.h"
|
||||
#include "tier0/icommandline.h"
|
||||
#include "video//ivideoservices.h"
|
||||
#include "../../sys_dll.h"
|
||||
#include "sys_dll.h"
|
||||
|
||||
// memdbgon must be the last include file in a .cpp file!!!
|
||||
#include "tier0/memdbgon.h"
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
#if !DEDICATED
|
||||
|
||||
#include "tier0/dynfunction.h"
|
||||
#include "video//ivideoservices.h"
|
||||
#include "../../sys_dll.h"
|
||||
#include "video/ivideoservices.h"
|
||||
#include "sys_dll.h"
|
||||
|
||||
// prevent some conflicts in SDL headers...
|
||||
#undef M_PI
|
||||
|
||||
@ -13,28 +13,28 @@
|
||||
#include "con_nprint.h"
|
||||
#include "tier0/icommandline.h"
|
||||
#include "vox_private.h"
|
||||
#include "../../traceinit.h"
|
||||
#include "../../cmd.h"
|
||||
#include "traceinit.h"
|
||||
#include "cmd.h"
|
||||
#include "toolframework/itoolframework.h"
|
||||
#include "vstdlib/random.h"
|
||||
#include "vstdlib/jobthread.h"
|
||||
#include "vaudio/ivaudio.h"
|
||||
#include "../../client.h"
|
||||
#include "../../cl_main.h"
|
||||
#include "client.h"
|
||||
#include "cl_main.h"
|
||||
#include "utldict.h"
|
||||
#include "mempool.h"
|
||||
#include "../../enginetrace.h" // for traceline
|
||||
#include "../../public/bspflags.h" // for traceline
|
||||
#include "../../public/gametrace.h" // for traceline
|
||||
#include "enginetrace.h" // for traceline
|
||||
#include "bspflags.h" // for traceline
|
||||
#include "gametrace.h" // for traceline
|
||||
#include "vphysics_interface.h" // for surface props
|
||||
#include "../../ispatialpartitioninternal.h" // for entity enumerator
|
||||
#include "../../debugoverlay.h"
|
||||
#include "ispatialpartitioninternal.h" // for entity enumerator
|
||||
#include "debugoverlay.h"
|
||||
#include "icliententity.h"
|
||||
#include "../../cmodel_engine.h"
|
||||
#include "../../staticpropmgr.h"
|
||||
#include "../../server.h"
|
||||
#include "cmodel_engine.h"
|
||||
#include "staticpropmgr.h"
|
||||
#include "server.h"
|
||||
#include "edict.h"
|
||||
#include "../../pure_server.h"
|
||||
#include "pure_server.h"
|
||||
#include "filesystem/IQueuedLoader.h"
|
||||
#include "voice.h"
|
||||
#if defined( _X360 )
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
#include "snd_mix_buf.h"
|
||||
|
||||
#include "iprediction.h"
|
||||
#include "../../common.h" // for parsing routines
|
||||
#include "common.h" // for parsing routines
|
||||
#include "vstdlib/random.h"
|
||||
// memdbgon must be the last include file in a .cpp file!!!
|
||||
#include "tier0/memdbgon.h"
|
||||
|
||||
@ -7,10 +7,10 @@
|
||||
#include "audio_pch.h"
|
||||
|
||||
#include "mouthinfo.h"
|
||||
#include "../../cl_main.h"
|
||||
#include "cl_main.h"
|
||||
#include "icliententitylist.h"
|
||||
#include "icliententity.h"
|
||||
#include "../../sys_dll.h"
|
||||
#include "sys_dll.h"
|
||||
#include "video/ivideoservices.h"
|
||||
#include "engine/IEngineSound.h"
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
#include "snd_mp3_source.h"
|
||||
#include "utlsymbol.h"
|
||||
#include "checksum_crc.h"
|
||||
#include "../../host.h"
|
||||
#include "host.h"
|
||||
#include "xwvfile.h"
|
||||
#include "filesystem/IQueuedLoader.h"
|
||||
#include "tier1/lzmaDecoder.h"
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
#include "ivoicerecord.h"
|
||||
#include "ivoicecodec.h"
|
||||
#include "filesystem.h"
|
||||
#include "../../filesystem_engine.h"
|
||||
#include "filesystem_engine.h"
|
||||
#include "tier1/utlbuffer.h"
|
||||
#if defined( _X360 )
|
||||
#include "xauddefs.h"
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
#include "engine/IEngineSound.h"
|
||||
#include "utlsymbol.h"
|
||||
#include "utldict.h"
|
||||
#include "../../MapReslistGenerator.h"
|
||||
#include "MapReslistGenerator.h"
|
||||
|
||||
// memdbgon must be the last include file in a .cpp file!!!
|
||||
#include "tier0/memdbgon.h"
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
#include "convar.h"
|
||||
#include "enginestats.h"
|
||||
#include "bspfile.h" // dworldlight_t
|
||||
#include "audio/public/soundservice.h"
|
||||
#include "soundservice.h"
|
||||
#include "tier0/systeminformation.h"
|
||||
|
||||
ISoundServices *g_pSoundServices = NULL;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
//
|
||||
//=============================================================================//
|
||||
|
||||
#include "audio/public/ivoicecodec.h"
|
||||
#include "ivoicecodec.h"
|
||||
#include <string.h>
|
||||
#include "tier0/dbg.h"
|
||||
#include "iframeencoder.h"
|
||||
|
||||
@ -29,7 +29,7 @@ def build(bld):
|
||||
'../../../public/tier0',
|
||||
'../../',
|
||||
'../../../common',
|
||||
'../../audio/public',
|
||||
'../../../public/engine/audio',
|
||||
'celt'
|
||||
]
|
||||
|
||||
|
||||
@ -191,35 +191,35 @@ def build(bld):
|
||||
'../common/SourceAppInfo.cpp',
|
||||
'snd_io.cpp',
|
||||
'EngineSoundServer.cpp',
|
||||
'audio/private/voice_wavefile.cpp',
|
||||
'audio/private/vox.cpp',
|
||||
'audio/voice_wavefile.cpp',
|
||||
'audio/vox.cpp',
|
||||
|
||||
#'audio/private/snd_dev_xaudio.cpp',[$X360]
|
||||
#'audio/private/snd_wave_mixer_xma.cpp', [$X360]
|
||||
#'audio/snd_dev_xaudio.cpp',[$X360]
|
||||
#'audio/snd_wave_mixer_xma.cpp', [$X360]
|
||||
|
||||
#'audio/private/snd_dev_openal.cpp', # [$OSXALL]
|
||||
#'audio/private/snd_dev_mac_audioqueue.cpp',# [$OSXALL]
|
||||
#'audio/private/voice_record_mac_audioqueue.cpp', #[$OSXALL]
|
||||
#'audio/snd_dev_openal.cpp', # [$OSXALL]
|
||||
#'audio/snd_dev_mac_audioqueue.cpp',# [$OSXALL]
|
||||
#'audio/voice_record_mac_audioqueue.cpp', #[$OSXALL]
|
||||
]
|
||||
|
||||
if bld.env.SDL:
|
||||
source += [
|
||||
'audio/private/snd_dev_sdl.cpp', #[$SDL && !$OSXALL]
|
||||
'audio/private/voice_record_sdl.cpp' #[$OSXALL||$LINUXALL]
|
||||
'audio/snd_dev_sdl.cpp', #[$SDL && !$OSXALL]
|
||||
'audio/voice_record_sdl.cpp' #[$OSXALL||$LINUXALL]
|
||||
]
|
||||
|
||||
if bld.env.DEST_OS == 'win32':
|
||||
source += [
|
||||
'../public/tier0/memoverride.cpp',
|
||||
'audio/private/snd_dev_direct.cpp',
|
||||
'audio/private/snd_dev_wave.cpp',
|
||||
'audio/private/voice_mixer_controls.cpp',
|
||||
'audio/private/voice_record_dsound.cpp',
|
||||
'audio/snd_dev_direct.cpp',
|
||||
'audio/snd_dev_wave.cpp',
|
||||
'audio/voice_mixer_controls.cpp',
|
||||
'audio/voice_record_dsound.cpp',
|
||||
]
|
||||
else:
|
||||
source += [
|
||||
'sys_linuxwind.cpp',
|
||||
'audio/private/snd_posix.cpp',
|
||||
'audio/snd_posix.cpp',
|
||||
]
|
||||
|
||||
if bld.env.DEDICATED:
|
||||
@ -286,29 +286,29 @@ def build(bld):
|
||||
'sys_getmodes.cpp',
|
||||
'vgui_askconnectpanel.cpp',
|
||||
'xboxsystem.cpp',
|
||||
'audio/audio_pch.cpp',
|
||||
# 'audio/audio_pch.cpp',
|
||||
'EngineSoundClient.cpp',
|
||||
'engsoundservice.cpp',
|
||||
'audio/private/MPAFile.cpp', #[!$X360]
|
||||
'audio/private/MPAHeader.cpp', #[!$X360]
|
||||
'audio/private/circularbuffer.cpp',
|
||||
'audio/private/snd_dev_common.cpp',
|
||||
'audio/private/snd_dma.cpp',
|
||||
'audio/private/snd_dsp.cpp',
|
||||
'audio/private/snd_mix.cpp',
|
||||
'audio/private/snd_sentence_mixer.cpp',
|
||||
'audio/private/snd_wave_data.cpp',
|
||||
'audio/private/snd_wave_mixer.cpp',
|
||||
'audio/private/snd_wave_mixer_adpcm.cpp',
|
||||
'audio/private/snd_wave_source.cpp',
|
||||
'audio/private/snd_wave_temp.cpp',
|
||||
'audio/private/snd_win.cpp',
|
||||
'audio/private/voice_gain.cpp',
|
||||
'audio/private/snd_mp3_source.cpp',
|
||||
'audio/private/snd_wave_mixer_mp3.cpp',
|
||||
'audio/private/VBRHeader.cpp', #[!$X360]
|
||||
'audio/private/voice.cpp', #[!$X360]
|
||||
'audio/private/voice_sound_engine_interface.cpp', #[!$X360]
|
||||
'audio/MPAFile.cpp', #[!$X360]
|
||||
'audio/MPAHeader.cpp', #[!$X360]
|
||||
'audio/circularbuffer.cpp',
|
||||
'audio/snd_dev_common.cpp',
|
||||
'audio/snd_dma.cpp',
|
||||
'audio/snd_dsp.cpp',
|
||||
'audio/snd_mix.cpp',
|
||||
'audio/snd_sentence_mixer.cpp',
|
||||
'audio/snd_wave_data.cpp',
|
||||
'audio/snd_wave_mixer.cpp',
|
||||
'audio/snd_wave_mixer_adpcm.cpp',
|
||||
'audio/snd_wave_source.cpp',
|
||||
'audio/snd_wave_temp.cpp',
|
||||
'audio/snd_win.cpp',
|
||||
'audio/voice_gain.cpp',
|
||||
'audio/snd_mp3_source.cpp',
|
||||
'audio/snd_wave_mixer_mp3.cpp',
|
||||
'audio/VBRHeader.cpp', #[!$X360]
|
||||
'audio/voice.cpp', #[!$X360]
|
||||
'audio/voice_sound_engine_interface.cpp', #[!$X360]
|
||||
'../public/vgui_controls/vgui_controls.cpp',
|
||||
'../common/vgui/vgui_basebudgetpanel.cpp',
|
||||
'../common/vgui/vgui_budgetbargraphpanel.cpp',
|
||||
@ -329,8 +329,8 @@ def build(bld):
|
||||
|
||||
if bld.env.DEST_OS != 'win32':
|
||||
source += [
|
||||
'audio/private/voice_mixer_controls_openal.cpp', #[$OSXALL||$LINUXALL]
|
||||
'audio/private/voice_record_openal.cpp' #[$OSXALL||$LINUXALL]
|
||||
'audio/voice_mixer_controls_openal.cpp', #[$OSXALL||$LINUXALL]
|
||||
'audio/voice_record_openal.cpp' #[$OSXALL||$LINUXALL]
|
||||
]
|
||||
|
||||
includes = [
|
||||
@ -340,8 +340,8 @@ def build(bld):
|
||||
'../public/tier1',
|
||||
'../common',
|
||||
'audio',
|
||||
'audio/public',
|
||||
'audio/private',
|
||||
'../public/engine/audio/',
|
||||
'audio/',
|
||||
]
|
||||
|
||||
defines = []
|
||||
|
||||
Loading…
Reference in New Issue
Block a user