d4708
/
source-engine
mirror of https://github.com/nillerusr/source-engine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

engine/audio: fix build

pull/133/head
nillerusr 2 years ago
parent
a68d5d8633
commit
bca0ae8c59
12 changed files with 64 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      engine/audio/snd_dev_direct.cpp
  2. 4
      engine/audio/snd_dev_sdl.cpp
  3. 26
      engine/audio/snd_dma.cpp
  4. 2
      engine/audio/snd_dsp.cpp
  5. 4
      engine/audio/snd_mix.cpp
  6. 2
      engine/audio/snd_wave_source.cpp
  7. 2
      engine/audio/voice.cpp
  8. 2
      engine/audio/vox.cpp
  9. 2
      engine/cl_null.cpp
  10. 2
      engine/voice_codecs/frame_encoder/voice_codec_frame.cpp
  11. 2
      engine/voice_codecs/opus/wscript
  12. 78
      engine/wscript

2
engine/audio/snd_dev_direct.cpp
Unescape View File

@ -19,7 +19,7 @@
#include "eax.h" #include "eax.h"
#include "tier0/icommandline.h" #include "tier0/icommandline.h"
#include "video//ivideoservices.h" #include "video//ivideoservices.h"
#include "../../sys_dll.h" #include "sys_dll.h"
// memdbgon must be the last include file in a .cpp file!!! // memdbgon must be the last include file in a .cpp file!!!
#include "tier0/memdbgon.h" #include "tier0/memdbgon.h"

4
engine/audio/snd_dev_sdl.cpp
Unescape View File

@ -9,8 +9,8 @@
#if !DEDICATED #if !DEDICATED
#include "tier0/dynfunction.h" #include "tier0/dynfunction.h"
#include "video//ivideoservices.h" #include "video/ivideoservices.h"
#include "../../sys_dll.h" #include "sys_dll.h"
// prevent some conflicts in SDL headers... // prevent some conflicts in SDL headers...
#undef M_PI #undef M_PI

26
engine/audio/snd_dma.cpp
Unescape View File

@ -13,28 +13,28 @@
#include "con_nprint.h" #include "con_nprint.h"
#include "tier0/icommandline.h" #include "tier0/icommandline.h"
#include "vox_private.h" #include "vox_private.h"
#include "../../traceinit.h" #include "traceinit.h"
#include "../../cmd.h" #include "cmd.h"
#include "toolframework/itoolframework.h" #include "toolframework/itoolframework.h"
#include "vstdlib/random.h" #include "vstdlib/random.h"
#include "vstdlib/jobthread.h" #include "vstdlib/jobthread.h"
#include "vaudio/ivaudio.h" #include "vaudio/ivaudio.h"
#include "../../client.h" #include "client.h"
#include "../../cl_main.h" #include "cl_main.h"
#include "utldict.h" #include "utldict.h"
#include "mempool.h" #include "mempool.h"
#include "../../enginetrace.h" // for traceline #include "enginetrace.h" // for traceline
#include "../../public/bspflags.h" // for traceline #include "bspflags.h" // for traceline
#include "../../public/gametrace.h" // for traceline #include "gametrace.h" // for traceline
#include "vphysics_interface.h" // for surface props #include "vphysics_interface.h" // for surface props
#include "../../ispatialpartitioninternal.h" // for entity enumerator #include "ispatialpartitioninternal.h" // for entity enumerator
#include "../../debugoverlay.h" #include "debugoverlay.h"
#include "icliententity.h" #include "icliententity.h"
#include "../../cmodel_engine.h" #include "cmodel_engine.h"
#include "../../staticpropmgr.h" #include "staticpropmgr.h"
#include "../../server.h" #include "server.h"
#include "edict.h" #include "edict.h"
#include "../../pure_server.h" #include "pure_server.h"
#include "filesystem/IQueuedLoader.h" #include "filesystem/IQueuedLoader.h"
#include "voice.h" #include "voice.h"
#if defined( _X360 ) #if defined( _X360 )

2
engine/audio/snd_dsp.cpp
Unescape View File

@ -12,7 +12,7 @@
#include "snd_mix_buf.h" #include "snd_mix_buf.h"
#include "iprediction.h" #include "iprediction.h"
#include "../../common.h" // for parsing routines #include "common.h" // for parsing routines
#include "vstdlib/random.h" #include "vstdlib/random.h"
// memdbgon must be the last include file in a .cpp file!!! // memdbgon must be the last include file in a .cpp file!!!
#include "tier0/memdbgon.h" #include "tier0/memdbgon.h"

4
engine/audio/snd_mix.cpp
Unescape View File

@ -7,10 +7,10 @@
#include "audio_pch.h" #include "audio_pch.h"
#include "mouthinfo.h" #include "mouthinfo.h"
#include "../../cl_main.h" #include "cl_main.h"
#include "icliententitylist.h" #include "icliententitylist.h"
#include "icliententity.h" #include "icliententity.h"
#include "../../sys_dll.h" #include "sys_dll.h"
#include "video/ivideoservices.h" #include "video/ivideoservices.h"
#include "engine/IEngineSound.h" #include "engine/IEngineSound.h"

2
engine/audio/snd_wave_source.cpp
Unescape View File

@ -10,7 +10,7 @@
#include "snd_mp3_source.h" #include "snd_mp3_source.h"
#include "utlsymbol.h" #include "utlsymbol.h"
#include "checksum_crc.h" #include "checksum_crc.h"
#include "../../host.h" #include "host.h"
#include "xwvfile.h" #include "xwvfile.h"
#include "filesystem/IQueuedLoader.h" #include "filesystem/IQueuedLoader.h"
#include "tier1/lzmaDecoder.h" #include "tier1/lzmaDecoder.h"

2
engine/audio/voice.cpp
Unescape View File

@ -18,7 +18,7 @@
#include "ivoicerecord.h" #include "ivoicerecord.h"
#include "ivoicecodec.h" #include "ivoicecodec.h"
#include "filesystem.h" #include "filesystem.h"
#include "../../filesystem_engine.h" #include "filesystem_engine.h"
#include "tier1/utlbuffer.h" #include "tier1/utlbuffer.h"
#if defined( _X360 ) #if defined( _X360 )
#include "xauddefs.h" #include "xauddefs.h"

2
engine/audio/vox.cpp
Unescape View File

@ -52,7 +52,7 @@
#include "engine/IEngineSound.h" #include "engine/IEngineSound.h"
#include "utlsymbol.h" #include "utlsymbol.h"
#include "utldict.h" #include "utldict.h"
#include "../../MapReslistGenerator.h" #include "MapReslistGenerator.h"
// memdbgon must be the last include file in a .cpp file!!! // memdbgon must be the last include file in a .cpp file!!!
#include "tier0/memdbgon.h" #include "tier0/memdbgon.h"

2
engine/cl_null.cpp
Unescape View File

@ -10,7 +10,7 @@
#include "convar.h" #include "convar.h"
#include "enginestats.h" #include "enginestats.h"
#include "bspfile.h" // dworldlight_t #include "bspfile.h" // dworldlight_t
#include "audio/public/soundservice.h" #include "soundservice.h"
#include "tier0/systeminformation.h" #include "tier0/systeminformation.h"
ISoundServices *g_pSoundServices = NULL; ISoundServices *g_pSoundServices = NULL;

2
engine/voice_codecs/frame_encoder/voice_codec_frame.cpp
Unescape View File

@ -6,7 +6,7 @@
// //
//=============================================================================// //=============================================================================//
#include "audio/public/ivoicecodec.h" #include "ivoicecodec.h"
#include <string.h> #include <string.h>
#include "tier0/dbg.h" #include "tier0/dbg.h"
#include "iframeencoder.h" #include "iframeencoder.h"

2
engine/voice_codecs/opus/wscript
Unescape View File

@ -29,7 +29,7 @@ def build(bld):
'../../../public/tier0', '../../../public/tier0',
'../../', '../../',
'../../../common', '../../../common',
'../../audio/public', '../../../public/engine/audio',
'celt' 'celt'
] ]

78
engine/wscript
Unescape View File

@ -191,35 +191,35 @@ def build(bld):
'../common/SourceAppInfo.cpp', '../common/SourceAppInfo.cpp',
'snd_io.cpp', 'snd_io.cpp',
'EngineSoundServer.cpp', 'EngineSoundServer.cpp',
'audio/private/voice_wavefile.cpp', 'audio/voice_wavefile.cpp',
'audio/private/vox.cpp', 'audio/vox.cpp',
#'audio/private/snd_dev_xaudio.cpp',[$X360] #'audio/snd_dev_xaudio.cpp',[$X360]
#'audio/private/snd_wave_mixer_xma.cpp', [$X360] #'audio/snd_wave_mixer_xma.cpp', [$X360]
#'audio/private/snd_dev_openal.cpp', # [$OSXALL] #'audio/snd_dev_openal.cpp', # [$OSXALL]
#'audio/private/snd_dev_mac_audioqueue.cpp',# [$OSXALL] #'audio/snd_dev_mac_audioqueue.cpp',# [$OSXALL]
#'audio/private/voice_record_mac_audioqueue.cpp', #[$OSXALL] #'audio/voice_record_mac_audioqueue.cpp', #[$OSXALL]
] ]
if bld.env.SDL: if bld.env.SDL:
source += [ source += [
'audio/private/snd_dev_sdl.cpp', #[$SDL && !$OSXALL] 'audio/snd_dev_sdl.cpp', #[$SDL && !$OSXALL]
'audio/private/voice_record_sdl.cpp' #[$OSXALL||$LINUXALL] 'audio/voice_record_sdl.cpp' #[$OSXALL||$LINUXALL]
] ]
if bld.env.DEST_OS == 'win32': if bld.env.DEST_OS == 'win32':
source += [ source += [
'../public/tier0/memoverride.cpp', '../public/tier0/memoverride.cpp',
'audio/private/snd_dev_direct.cpp', 'audio/snd_dev_direct.cpp',
'audio/private/snd_dev_wave.cpp', 'audio/snd_dev_wave.cpp',
'audio/private/voice_mixer_controls.cpp', 'audio/voice_mixer_controls.cpp',
'audio/private/voice_record_dsound.cpp', 'audio/voice_record_dsound.cpp',
] ]
else: else:
source += [ source += [
'sys_linuxwind.cpp', 'sys_linuxwind.cpp',
'audio/private/snd_posix.cpp', 'audio/snd_posix.cpp',
] ]
if bld.env.DEDICATED: if bld.env.DEDICATED:
@ -286,29 +286,29 @@ def build(bld):
'sys_getmodes.cpp', 'sys_getmodes.cpp',
'vgui_askconnectpanel.cpp', 'vgui_askconnectpanel.cpp',
'xboxsystem.cpp', 'xboxsystem.cpp',
'audio/audio_pch.cpp', # 'audio/audio_pch.cpp',
'EngineSoundClient.cpp', 'EngineSoundClient.cpp',
'engsoundservice.cpp', 'engsoundservice.cpp',
'audio/private/MPAFile.cpp', #[!$X360] 'audio/MPAFile.cpp', #[!$X360]
'audio/private/MPAHeader.cpp', #[!$X360] 'audio/MPAHeader.cpp', #[!$X360]
'audio/private/circularbuffer.cpp', 'audio/circularbuffer.cpp',
'audio/private/snd_dev_common.cpp', 'audio/snd_dev_common.cpp',
'audio/private/snd_dma.cpp', 'audio/snd_dma.cpp',
'audio/private/snd_dsp.cpp', 'audio/snd_dsp.cpp',
'audio/private/snd_mix.cpp', 'audio/snd_mix.cpp',
'audio/private/snd_sentence_mixer.cpp', 'audio/snd_sentence_mixer.cpp',
'audio/private/snd_wave_data.cpp', 'audio/snd_wave_data.cpp',
'audio/private/snd_wave_mixer.cpp', 'audio/snd_wave_mixer.cpp',
'audio/private/snd_wave_mixer_adpcm.cpp', 'audio/snd_wave_mixer_adpcm.cpp',
'audio/private/snd_wave_source.cpp', 'audio/snd_wave_source.cpp',
'audio/private/snd_wave_temp.cpp', 'audio/snd_wave_temp.cpp',
'audio/private/snd_win.cpp', 'audio/snd_win.cpp',
'audio/private/voice_gain.cpp', 'audio/voice_gain.cpp',
'audio/private/snd_mp3_source.cpp', 'audio/snd_mp3_source.cpp',
'audio/private/snd_wave_mixer_mp3.cpp', 'audio/snd_wave_mixer_mp3.cpp',
'audio/private/VBRHeader.cpp', #[!$X360] 'audio/VBRHeader.cpp', #[!$X360]
'audio/private/voice.cpp', #[!$X360] 'audio/voice.cpp', #[!$X360]
'audio/private/voice_sound_engine_interface.cpp', #[!$X360] 'audio/voice_sound_engine_interface.cpp', #[!$X360]
'../public/vgui_controls/vgui_controls.cpp', '../public/vgui_controls/vgui_controls.cpp',
'../common/vgui/vgui_basebudgetpanel.cpp', '../common/vgui/vgui_basebudgetpanel.cpp',
'../common/vgui/vgui_budgetbargraphpanel.cpp', '../common/vgui/vgui_budgetbargraphpanel.cpp',
@ -329,8 +329,8 @@ def build(bld):
if bld.env.DEST_OS != 'win32': if bld.env.DEST_OS != 'win32':
source += [ source += [
'audio/private/voice_mixer_controls_openal.cpp', #[$OSXALL||$LINUXALL] 'audio/voice_mixer_controls_openal.cpp', #[$OSXALL||$LINUXALL]
'audio/private/voice_record_openal.cpp' #[$OSXALL||$LINUXALL] 'audio/voice_record_openal.cpp' #[$OSXALL||$LINUXALL]
] ]
includes = [ includes = [
@ -340,8 +340,8 @@ def build(bld):
'../public/tier1', '../public/tier1',
'../common', '../common',
'audio', 'audio',
'audio/public', '../public/engine/audio/',
'audio/private', 'audio/',
] ]
defines = [] defines = []

Write Preview
Loading…
Cancel
Save