Skip to content

Commit edbe1ba

Browse files
JusicPJusicP
committed
Fix Windows build with WAF
1 parent b296444 commit edbe1ba

File tree

31 files changed

+359
-124
lines changed

31 files changed

+359
-124
lines changed

‎appframework/wscript‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,24 @@ def build(bld):
1818
source = [
1919
'AppSystemGroup.cpp',
2020
'../public/filesystem_init.cpp',
21-
# 'vguimatsysapp.cpp' [$WIN32]
22-
# 'winapp.cpp' [$WIN32]
23-
'posixapp.cpp',# [$POSIX]
24-
'sdlmgr.cpp'# [$SDL]
2521
# 'glmrendererinfo_osx.mm' [$OSXALL]
2622
]
2723

24+
if bld.env.SDL:
25+
source += [
26+
'sdlmgr.cpp'
27+
]
28+
29+
if bld.env.DEST_OS == 'win32':
30+
source += [
31+
'vguimatsysapp.cpp',
32+
'winapp.cpp'
33+
]
34+
else:
35+
source += [
36+
'posixapp.cpp',# [$POSIX]
37+
]
38+
2839
includes = [
2940
'.',
3041
'../public',

‎bitmap/wscript‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ def build(bld):
2121
'float_bm.cpp',
2222
'float_bm2.cpp',
2323
'float_bm3.cpp',
24-
#'float_bm4.cpp', [$WINDOWS]
2524
'float_bm_bilateral_filter.cpp',
2625
'float_cube.cpp',
2726
'imageformat.cpp',
@@ -31,6 +30,11 @@ def build(bld):
3130
'tgawriter.cpp',
3231
'bitmap.cpp'
3332
]
33+
34+
if bld.env.DEST_OS == 'win32':
35+
source += [
36+
'float_bm4.cpp'
37+
]
3438

3539
includes = [
3640
'.',
@@ -43,6 +47,9 @@ def build(bld):
4347
defines = []
4448

4549
libs = []
50+
51+
if bld.env.DEST_OS == 'win32':
52+
libs += ['NVTC', 'ATI_COMPRESS_MT_VC10']
4653

4754
bld.stlib(
4855
source = source,

‎dedicated/wscript‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,28 @@ def build(bld):
2424
'../common/SteamAppStartup.cpp',
2525
'sys_common.cpp',
2626
'sys_ded.cpp',
27-
#'sys_windows.cpp', [$WINDOWS]
28-
'sys_linux.cpp', # [$POSIX]
2927
'console/conproc.cpp',
3028
'console/textconsole.cpp',
31-
'console/TextConsoleUnix.cpp', # [$POSIX]
3229
'../filesystem/filetracker.cpp',
3330
'../filesystem/basefilesystem.cpp',
3431
'../filesystem/packfile.cpp',
3532
'../filesystem/filesystem_async.cpp',
3633
'../filesystem/filesystem_stdio.cpp',
3734
'../filesystem/QueuedLoader.cpp',
3835
'../public/zip_utils.cpp',
39-
'../filesystem/linux_support.cpp' # [$POSIX]
4036
]
4137

38+
if bld.env.DEST_OS == 'win32'
39+
source += [
40+
'sys_windows.cpp'
41+
]
42+
else:
43+
source += [
44+
'sys_linux.cpp', # [$POSIX]
45+
'console/TextConsoleUnix.cpp', # [$POSIX]
46+
'../filesystem/linux_support.cpp' # [$POSIX]
47+
]
48+
4249
includes = [
4350
'.',
4451
'../public',

‎engine/audio/private/snd_dev_direct.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// Fix for VS 2010 build errors copied from Dota
1212
#if !defined( NEW_DXSDK ) && ( _MSC_VER >= 1600 )
1313
#undef KSDATAFORMAT_SUBTYPE_WAVEFORMATEX
14-
#undef KSDATAFORMAT_SUBTYPE_PCM
14+
//#undef KSDATAFORMAT_SUBTYPE_PCM
1515
#undef KSDATAFORMAT_SUBTYPE_IEEE_FLOAT
1616
#endif
1717
#include <ksmedia.h>

‎engine/wscript‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ def build(bld):
171171
'sys_dll.cpp',
172172
'sys_dll2.cpp',
173173
'sys_engine.cpp',
174-
'sys_linuxwind.cpp', #[$POSIX]
175174
'testscriptmgr.cpp',
176175
'traceinit.cpp',
177176
'../public/vallocator.cpp',
@@ -193,21 +192,34 @@ def build(bld):
193192
'EngineSoundServer.cpp',
194193
'audio/private/voice_wavefile.cpp',
195194
'audio/private/vox.cpp',
196-
'audio/private/snd_posix.cpp', # [$POSIX]
197-
#'audio/private/snd_dev_direct.cpp', [$WINDOWS]/
198-
#'audio/private/snd_dev_wave.cpp', [$WINDOWS]/
199-
#'audio/private/voice_mixer_controls.cpp', [$WINDOWS] /
200-
#'audio/private/voice_record_dsound.cpp', [$WINDOWS] /
201195

202196
#'audio/private/snd_dev_xaudio.cpp',[$X360]
203197
#'audio/private/snd_wave_mixer_xma.cpp', [$X360]
204198

205-
'audio/private/snd_dev_sdl.cpp', #[$SDL && !$OSXALL]
206199
#'audio/private/snd_dev_openal.cpp', # [$OSXALL]
207200
#'audio/private/snd_dev_mac_audioqueue.cpp',# [$OSXALL]
208201
#'audio/private/voice_record_mac_audioqueue.cpp', #[$OSXALL]
209202
]
210203

204+
if bld.env.SDL:
205+
source += [
206+
'audio/private/snd_dev_sdl.cpp' #[$SDL && !$OSXALL]
207+
]
208+
209+
if bld.env.DEST_OS == 'win32':
210+
source += [
211+
'../public/tier0/memoverride.cpp',
212+
'audio/private/snd_dev_direct.cpp',
213+
'audio/private/snd_dev_wave.cpp',
214+
'audio/private/voice_mixer_controls.cpp',
215+
'audio/private/voice_record_dsound.cpp',
216+
]
217+
else:
218+
source += [
219+
'sys_linuxwind.cpp',
220+
'audio/private/snd_posix.cpp',
221+
]
222+
211223
if bld.env.DEDICATED:
212224
source += ['cl_null.cpp']
213225
else:
@@ -295,8 +307,6 @@ def build(bld):
295307
'audio/private/VBRHeader.cpp', #[!$X360]
296308
'audio/private/voice.cpp', #[!$X360]
297309
'audio/private/voice_sound_engine_interface.cpp', #[!$X360]
298-
'audio/private/voice_mixer_controls_openal.cpp', #[$OSXALL||$LINUXALL]
299-
'audio/private/voice_record_openal.cpp', #[$OSXALL||$LINUXALL]
300310
'../public/vgui_controls/vgui_controls.cpp',
301311
'../common/vgui/vgui_basebudgetpanel.cpp',
302312
'../common/vgui/vgui_budgetbargraphpanel.cpp',
@@ -314,6 +324,12 @@ def build(bld):
314324
'vgui_vprofpanel.cpp',
315325
'toolframework.cpp'
316326
]
327+
328+
if bld.env.DEST_OS != 'win32':
329+
source += [
330+
'audio/private/voice_mixer_controls_openal.cpp', #[$OSXALL||$LINUXALL]
331+
'audio/private/voice_record_openal.cpp' #[$OSXALL||$LINUXALL]
332+
]
317333

318334
includes = [
319335
'.',
@@ -332,7 +348,9 @@ def build(bld):
332348

333349
if bld.env.DEST_OS == 'android':
334350
libs += ['SSL', 'CRYPTO'] # android curl was built with openssl
335-
351+
elif bld.env.DEST_OS == 'win32':
352+
libs += ['USER32', 'WINMM', 'WININET', 'DSOUND', 'DXGUID', 'GDI32', 'bzip2']
353+
336354
install_path = bld.env.LIBDIR
337355

338356
bld.shlib(

‎filesystem/wscript‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,14 @@ def build(bld):
2828
'../public/kevvaluescompiler.cpp',
2929
'../public/zip_utils.cpp',
3030
'QueuedLoader.cpp',
31-
'linux_support.cpp', # [$POSIX]
3231
'../public/tier0/memoverride.cpp'
3332
]
3433

34+
if bld.env.DEST_OS != 'win32':
35+
source += [
36+
'linux_support.cpp'
37+
]
38+
3539
includes = [
3640
'.',
3741
'../public',
@@ -43,6 +47,9 @@ def build(bld):
4347
defines = []
4448

4549
libs = ['tier0','tier1','tier2','vstdlib','vpklib']
50+
51+
if bld.env.DEST_OS == 'win32':
52+
libs += ['SHELL32']
4653

4754
install_path = bld.env.LIBDIR
4855

‎game/client/wscript‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,11 @@ def build(bld):
6666
if bld.env.DEST_OS != 'android':
6767
install_path += '/'+bld.env.GAMES+'/bin'
6868

69-
source = [ 'touch.cpp', 'arch.c' ]
70-
69+
source = [ 'arch.c' ]
70+
if bld.env.DEST_OS == 'win32':
71+
source += [ '../../public/tier0/memoverride.cpp' ]
72+
libs += ['USER32']
73+
7174
if bld.env.DEST_OS == 'android':
7275
source += [
7376
'third/minizip/mz_zip.c',

‎game/server/wscript‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ def build(bld):
5454
defines = []
5555

5656
libs = ['tier0','particles','dmxloader','tier1','tier2','tier3','mathlib','vstdlib','choreoobjects','steam_api']
57+
if bld.env.DEST_OS == 'win32':
58+
libs += ['USER32']
5759

5860
install_path = bld.env.PREFIX
5961
if bld.env.DEST_OS != 'android':
@@ -63,6 +65,9 @@ def build(bld):
6365
includes += game["includes"]
6466
defines = game["defines"]
6567

68+
if bld.env.DEST_OS == 'win32':
69+
source += ['../../public/tier0/memoverride.cpp']
70+
6671
defines.remove('PROTECTED_THINGS_ENABLE')
6772

6873
bld.shlib(

‎gameui/wscript‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ def build(bld):
2121
'BasePanel.cpp',
2222
'GameConsole.cpp',
2323
'GameUI_Interface.cpp',
24-
# 'LogoFile.cpp', [!$POSIX]
2524
'ModInfo.cpp',
2625
'MouseMessageForwardingPanel.cpp',
2726
'../common/GameUI/ObjectList.cpp',
@@ -66,7 +65,6 @@ def build(bld):
6665
'LoadCommentaryDialog.cpp',
6766
'LoadingDialog.cpp',
6867
'BaseSaveGameDialog.cpp',
69-
#'ChangeGameDialog.cpp', [!$POSIX]
7068
'CreateMultiplayerGameBotPage.cpp',
7169
'CreateMultiplayerGameDialog.cpp',
7270
'CreateMultiplayerGameGameplayPage.cpp',
@@ -87,7 +85,6 @@ def build(bld):
8785
'OptionsSubAudio.cpp',
8886
'OptionsSubDifficulty.cpp',
8987
'OptionsSubGame.cpp',
90-
#'OptionsSubHaptics.cpp', [$WIN32] [$WIN32]
9188
'OptionsSubKeyboard.cpp',
9289
'OptionsSubMouse.cpp',
9390
'OptionsSubMultiplayer.cpp',
@@ -96,6 +93,14 @@ def build(bld):
9693
'OptionsSubVoice.cpp',
9794
]
9895

96+
if bld.env.DEST_OS == 'win32':
97+
source += [
98+
'../public/tier0/memoverride.cpp',
99+
'LogoFile.cpp',
100+
'ChangeGameDialog.cpp',
101+
'OptionsSubHaptics.cpp'
102+
]
103+
99104
includes = [
100105
'.',
101106
'../public',
@@ -109,6 +114,9 @@ def build(bld):
109114

110115
libs = ['tier0','vgui_controls','tier1','tier2','tier3','vstdlib','vtf','bitmap','mathlib','SDL2','steam_api','matsys_controls','JPEG','PNG','ZLIB']
111116

117+
if bld.env.DEST_OS == 'win32':
118+
libs += ['USER32', 'GDI32']
119+
112120
install_path = bld.env.LIBDIR
113121

114122
bld.shlib(

‎inputsystem/wscript‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,15 @@ def build(bld):
1919
'inputsystem.cpp',
2020
'joystick_sdl.cpp',
2121
'touch_sdl.cpp',
22-
#'novint.cpp', # [$WIN32]
2322
'key_translation.cpp',
2423
'steamcontroller.cpp'
2524
]
2625

26+
if bld.env.DEST_OS == 'win32':
27+
source += [
28+
'novint.cpp'
29+
]
30+
2731
includes = [
2832
'.',
2933
'../common',
@@ -35,6 +39,9 @@ def build(bld):
3539

3640
libs = ['tier0','tier1','tier2','vstdlib','SDL2','steam_api']
3741

42+
if bld.env.DEST_OS == 'win32':
43+
libs += ['USER32']
44+
3845
install_path = bld.env.LIBDIR
3946

4047
bld.shlib(

0 commit comments

Comments
 (0)