H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2026-08-07 17:29:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Windows build with WAF

Browse Source
This commit is contained in:
JusicP
2022-03-19 14:40:11 +02:00
parent b296444d0c
commit edbe1baceb
31 changed files with 361 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/audio/private/snd_dev_direct.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
// Fix for VS 2010 build errors copied from Dota
#if !defined( NEW_DXSDK ) && ( _MSC_VER >= 1600 )
#undef KSDATAFORMAT_SUBTYPE_WAVEFORMATEX
#undef KSDATAFORMAT_SUBTYPE_PCM
//#undef KSDATAFORMAT_SUBTYPE_PCM
#undef KSDATAFORMAT_SUBTYPE_IEEE_FLOAT
#endif
#include <ksmedia.h>
engine/wscript
+28 -10
View File
@@ -171,7 +171,6 @@ def build(bld):
'sys_dll.cpp',
'sys_dll2.cpp',
'sys_engine.cpp',
'sys_linuxwind.cpp', #[$POSIX]
'testscriptmgr.cpp',
'traceinit.cpp',
'../public/vallocator.cpp',
@@ -193,21 +192,34 @@ def build(bld):
'EngineSoundServer.cpp',
'audio/private/voice_wavefile.cpp',
'audio/private/vox.cpp',
'audio/private/snd_posix.cpp', # [$POSIX]
#'audio/private/snd_dev_direct.cpp', [$WINDOWS]/
#'audio/private/snd_dev_wave.cpp', [$WINDOWS]/
#'audio/private/voice_mixer_controls.cpp', [$WINDOWS] /
#'audio/private/voice_record_dsound.cpp', [$WINDOWS] /
#'audio/private/snd_dev_xaudio.cpp',[$X360]
#'audio/private/snd_wave_mixer_xma.cpp', [$X360]
'audio/private/snd_dev_sdl.cpp', #[$SDL && !$OSXALL]
#'audio/private/snd_dev_openal.cpp', # [$OSXALL]
#'audio/private/snd_dev_mac_audioqueue.cpp',# [$OSXALL]
#'audio/private/voice_record_mac_audioqueue.cpp', #[$OSXALL]
]
if bld.env.SDL:
source += [
'audio/private/snd_dev_sdl.cpp' #[$SDL && !$OSXALL]
]
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',
]
else:
source += [
'sys_linuxwind.cpp',
'audio/private/snd_posix.cpp',
]
if bld.env.DEDICATED:
source += ['cl_null.cpp']
else:
@@ -295,8 +307,6 @@ def build(bld):
'audio/private/VBRHeader.cpp', #[!$X360]
'audio/private/voice.cpp', #[!$X360]
'audio/private/voice_sound_engine_interface.cpp', #[!$X360]
'audio/private/voice_mixer_controls_openal.cpp', #[$OSXALL||$LINUXALL]
'audio/private/voice_record_openal.cpp', #[$OSXALL||$LINUXALL]
'../public/vgui_controls/vgui_controls.cpp',
'../common/vgui/vgui_basebudgetpanel.cpp',
'../common/vgui/vgui_budgetbargraphpanel.cpp',
@@ -314,6 +324,12 @@ def build(bld):
'vgui_vprofpanel.cpp',
'toolframework.cpp'
]
if bld.env.DEST_OS != 'win32':
source += [
'audio/private/voice_mixer_controls_openal.cpp', #[$OSXALL||$LINUXALL]
'audio/private/voice_record_openal.cpp' #[$OSXALL||$LINUXALL]
]
includes = [
'.',
@@ -332,7 +348,9 @@ def build(bld):
if bld.env.DEST_OS == 'android':
libs += ['SSL', 'CRYPTO'] # android curl was built with openssl
elif bld.env.DEST_OS == 'win32':
libs += ['USER32', 'WINMM', 'WININET', 'DSOUND', 'DXGUID', 'GDI32', 'bzip2']
install_path = bld.env.LIBDIR
bld.shlib(