Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Narendra Umate 2013-12-02 23:36:05 -08:00
commit 8737f191f3
6742 changed files with 2805629 additions and 2805613 deletions

16
.gitattributes vendored
View File

@ -1,11 +1,23 @@
creategameprojects text
createallprojects text
xcode_ccache_wrapper text
vpc text
*.sh text
vpc_linux binary
vpc_osx binary
*.sh text
*.c text
*.h text
*.H text
*.cpp text
*.vpc text
*.vgc text
*.nut text
*.awk text
*.pl text
*.py text
*.xcconfig text
*.exe binary
protoc binary
ccache binary

View File

@ -1,4 +1,5 @@
#!/bin/bash
pushd `dirname $0`
devtools/bin/vpc /hl2mp +everything /mksln everything
popd

View File

@ -1,4 +1,5 @@
#!/bin/bash
pushd `dirname $0`
devtools/bin/vpc /hl2mp +game /mksln games
popd

View File

@ -1,4 +1,4 @@
$Macro PLATSUBDIR "\." [$WIN32]
$Macro PLATSUBDIR "\." [$WIN32]
$Macro PLATSUBDIR "\x64" [$WIN64]
$Macro PLATSUBDIR "\." [$X360]
$Macro PLATSUBDIR "\linux32" [$LINUX32]

View File

@ -1,4 +1,5 @@
#!/bin/bash
pushd `dirname $0`
devtools/bin/vpc /hl2 /episodic +everything /mksln everything
popd

View File

@ -1,4 +1,5 @@
#!/bin/bash
pushd `dirname $0`
devtools/bin/vpc /hl2 /episodic +game /mksln games
popd

View File

@ -1,4 +1,4 @@
$Macro PLATSUBDIR "\." [$WIN32]
$Macro PLATSUBDIR "\." [$WIN32]
$Macro PLATSUBDIR "\x64" [$WIN64]
$Macro PLATSUBDIR "\." [$X360]
$Macro PLATSUBDIR "\linux32" [$LINUX32]