xutaxkamay/css_enhanced_waf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix VPC scripts for VS2019

Browse source
This commit is contained in:
JusicP 2022-02-03 18:18:12 +02:00
parent 4e74e8e3fd
commit 6c85ab8cb7
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/engine.vpc
View file

@ -1120,7 +1120,7 @@ $Project "engine"
// http://code.google.com/p/gperftools/wiki/GooglePerformanceTools
$File "$SRCDIR/thirdparty/gperftools-2.0/.libs/libprofiler.so" [$GPROFILER]
$Lib "$LIBCOMMON/binkw32" [$WIN32&&!$QUICKTIME_WIN32]
//$Lib "$LIBCOMMON/binkw32" [$WIN32&&!$QUICKTIME_WIN32]
$File "$LIBCOMMON\quicktime\QTMLClient" [$WIN32&&$QUICKTIME_WIN32]
$ImpLib "SDL2" [$SDL]
$File "$SRCDIR\DX9SDK\lib\dsound.lib" [$WIN32]

4
gameui/GameUI.vpc
View file

@ -246,8 +246,8 @@ $Project "GameUI"
$Lib vtf
$Lib "$LIBCOMMON/libjpeg" [!$DEDICATED]
$ImpLib steam_api
$Lib libpng [!$VS2015&&!$DEDICATED]
$Lib $LIBCOMMON/libpng [$VS2015&&!$DEDICATED]
$Lib libpng [!$VS2015 && !$VS2019 && !$DEDICATED]
$Lib $LIBCOMMON/libpng [($VS2015 || $VS2019) && !$DEDICATED]
$Lib libz [!$DEDICATED]
$ImpLib SDL2 [$SDL]
}

6
replay/replay.vpc
View file

@ -201,12 +201,12 @@ $Project "replay"
$Libexternal $LIBCOMMON/libcrypto [$OSXALL]
$Libexternal "$SRCDIR\lib\common\$(CRYPTOPPDIR)\libcrypto" [$LINUXALL]
$Libexternal libpng [!$VS2015]
$Libexternal $LIBCOMMON/libpng [$VS2015]
$Libexternal libpng [!$VS2015 && !$VS2019]
$Libexternal $LIBCOMMON/libpng [$VS2015 || $VS2019]
$ImpLib "$LIBCOMMON\curl" [$OSXALL]
$Lib "$LIBCOMMON\libcurl" [$WIN32&&!$VS2015]
$Lib "$LIBCOMMON\libcurl" [$WIN32&&!$VS2015&&!$VS2019]
$Lib "libz" [$WIN32]
$Libexternal libz [$LINUXALL]

6
vpc_scripts/source_dll_win32_base.vpc
View file

@ -12,9 +12,9 @@ $MacroRequired "OUTBINDIR"
$Macro OUTBINDIR "$OUTBINDIR$PLATSUBDIR"
$Macro LIBPUBLIC "$SRCDIR\lib\public$PLATSUBDIR"
$Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR" [!$VS2015]
$Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR\2015\release" [$VS2015&&!$WIN32]
$Macro LIBCOMMON "$SRCDIR\lib\common\win32\2015\release" [$VS2015&&$WIN32]
$Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR" [!$VS2015 && !$VS2019]
$Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR\2015\release" [($VS2015 || $VS2019) && !$WIN32]
$Macro LIBCOMMON "$SRCDIR\lib\common\win32\2015\release" [($VS2015 || $VS2019) && $WIN32]
$Include "$SRCDIR\vpc_scripts\loadaddress.vpc"
$Include "$SRCDIR\vpc_scripts\source_dll_win32_debug.vpc"

6
vpc_scripts/source_exe_win_win32_base.vpc
View file

@ -12,9 +12,9 @@ $MacroRequired "OUTBINDIR"
$Macro OUTBINDIR "$OUTBINDIR$PLATSUBDIR"
$Macro LIBPUBLIC "$SRCDIR\lib\public$PLATSUBDIR"
$Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR" [!$VS2015]
$Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR\2015\release" [$VS2015&&!$WIN32]
$Macro LIBCOMMON "$SRCDIR\lib\common\win32\2015\release" [$VS2015&&$WIN32]
$Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR" [!$VS2015 && !$VS2019]
$Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR\2015\release" [($VS2015 || $VS2019) && !$WIN32]
$Macro LIBCOMMON "$SRCDIR\lib\common\win32\2015\release" [($VS2015 || $VS2019) && $WIN32]
$Include "$SRCDIR\vpc_scripts\loadaddress.vpc"
$Include "$SRCDIR\vpc_scripts\source_exe_win_win32_debug.vpc"

6
vpc_scripts/source_lib_win32_base.vpc
View file

@ -11,9 +11,9 @@ $MacroRequired "OUTLIBNAME" "$PROJECTNAME"
$MacroRequired "OUTLIBDIR"
$Macro LIBPUBLIC "$SRCDIR\lib\public$PLATSUBDIR"
$Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR" [!$VS2015]
$Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR\2015\release" [$VS2015&&!$WIN32]
$Macro LIBCOMMON "$SRCDIR\lib\common\win32\2015\release" [$VS2015&&$WIN32]
$Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR" [!$VS2015 && !$VS2019]
$Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR\2015\release" [($VS2015 || $VS2019) && !$WIN32]
$Macro LIBCOMMON "$SRCDIR\lib\common\win32\2015\release" [($VS2015 || $VS2019) && $WIN32]
$Include "$SRCDIR\vpc_scripts\source_lib_win32_debug.vpc"
$Include "$SRCDIR\vpc_scripts\source_lib_win32_release.vpc"