diff options
| author | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
|---|---|---|
| committer | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
| commit | 4fa56874ba1557274c10077bf8386ece4c61dbd6 (patch) | |
| tree | e2d336604e960b548e996d2e7dcfc5a1e1401b9e /mp/src/devtools | |
| parent | Added DS_Store to .gitignore. (diff) | |
| parent | Make libSDL2.so/dylib into symlinks. (diff) | |
| download | source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.tar.xz source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.zip | |
Merge remote-tracking branch 'upstream/master'
Reverted .gitattributes xcode_ccache_wrapper change. Fixed line endings
for .gitignore and .gitattributes.
Diffstat (limited to 'mp/src/devtools')
| -rwxr-xr-x | mp/src/devtools/bin/linux/ccache | bin | 197505 -> 197505 bytes | |||
| -rwxr-xr-x | mp/src/devtools/bin/osx32/ccache | bin | 132512 -> 132504 bytes | |||
| -rw-r--r-- | mp/src/devtools/bin/vpc.exe | bin | 1133568 -> 1135616 bytes | |||
| -rwxr-xr-x | mp/src/devtools/bin/vpc_linux | bin | 1177324 -> 1178799 bytes | |||
| -rwxr-xr-x | mp/src/devtools/bin/vpc_osx | bin | 1098508 -> 1098528 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | mp/src/devtools/bin/vpccrccheck.exe | bin | 83296 -> 83296 bytes | |||
| -rw-r--r-- | mp/src/devtools/sourcesdk_def.mak | 6 | ||||
| -rw-r--r-- | mp/src/devtools/version_script.linux.txt | 28 |
8 files changed, 17 insertions, 17 deletions
diff --git a/mp/src/devtools/bin/linux/ccache b/mp/src/devtools/bin/linux/ccache Binary files differindex 3ef6b8e9..5146484f 100755 --- a/mp/src/devtools/bin/linux/ccache +++ b/mp/src/devtools/bin/linux/ccache diff --git a/mp/src/devtools/bin/osx32/ccache b/mp/src/devtools/bin/osx32/ccache Binary files differindex 86afc048..1b6a2e5f 100755 --- a/mp/src/devtools/bin/osx32/ccache +++ b/mp/src/devtools/bin/osx32/ccache diff --git a/mp/src/devtools/bin/vpc.exe b/mp/src/devtools/bin/vpc.exe Binary files differindex 2394de95..fcadab1c 100644 --- a/mp/src/devtools/bin/vpc.exe +++ b/mp/src/devtools/bin/vpc.exe diff --git a/mp/src/devtools/bin/vpc_linux b/mp/src/devtools/bin/vpc_linux Binary files differindex c69b62f5..47a07ba5 100755 --- a/mp/src/devtools/bin/vpc_linux +++ b/mp/src/devtools/bin/vpc_linux diff --git a/mp/src/devtools/bin/vpc_osx b/mp/src/devtools/bin/vpc_osx Binary files differindex 701d780e..d3ab3de6 100755 --- a/mp/src/devtools/bin/vpc_osx +++ b/mp/src/devtools/bin/vpc_osx diff --git a/mp/src/devtools/bin/vpccrccheck.exe b/mp/src/devtools/bin/vpccrccheck.exe Binary files differindex 5a151b00..5a151b00 100644..100755 --- a/mp/src/devtools/bin/vpccrccheck.exe +++ b/mp/src/devtools/bin/vpccrccheck.exe diff --git a/mp/src/devtools/sourcesdk_def.mak b/mp/src/devtools/sourcesdk_def.mak index 7912e08b..fc561ad7 100644 --- a/mp/src/devtools/sourcesdk_def.mak +++ b/mp/src/devtools/sourcesdk_def.mak @@ -1,3 +1,3 @@ -#defines these macros so that we skip VSIGN and P4 steps in the SDK
-SOURCE_SDK=1
-VALVE_NO_AUTO_P4=1
+#defines these macros so that we skip VSIGN and P4 steps in the SDK +SOURCE_SDK=1 +VALVE_NO_AUTO_P4=1 diff --git a/mp/src/devtools/version_script.linux.txt b/mp/src/devtools/version_script.linux.txt index c68a5ac1..2e1bcb7c 100644 --- a/mp/src/devtools/version_script.linux.txt +++ b/mp/src/devtools/version_script.linux.txt @@ -1,14 +1,14 @@ -{
- global: *;
- local:
- extern "C++" {
- *std::*;
- __cxxabi*;
- __gcc*;
- __gxx*;
- __gnu_cxx*;
- __cxa*;
- operator*;
- __dynamic_cast
- };
-};
+{ + global: *; + local: + extern "C++" { + *std::*; + __cxxabi*; + __gcc*; + __gxx*; + __gnu_cxx*; + __cxa*; + operator*; + __dynamic_cast + }; +}; |