diff --git a/AMBuildScript b/AMBuildScript
index b1bfa17c..7156024a 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -16,6 +16,7 @@ class AMXXConfig(object):
self.generated_headers = []
self.versionlib = None
self.zlib = None
+ self.hashing = None
self.csx_app = None
self.stdcxx_path = None
@@ -269,7 +270,9 @@ class AMXXConfig(object):
cfg.includes += [os.path.join(builder.sourcePath, 'public', 'sdk')]
cfg.includes += [os.path.join(builder.sourcePath, 'public', 'amtl', 'include')]
cfg.includes += [os.path.join(builder.sourcePath, 'public', 'memtools')]
- cfg.includes += [os.path.join(builder.sourcePath, 'public', 'hashing')]
+ cfg.includes += [os.path.join(builder.sourcePath, 'third_party')]
+ cfg.includes += [os.path.join(builder.sourcePath, 'third_party', 'hashing')]
+ cfg.includes += [os.path.join(builder.sourcePath, 'third_party', 'zlib')]
return
#
@@ -358,7 +361,11 @@ if AMXX.use_auto_versioning():
)
AMXX.zlib = builder.RunScript(
- 'public/zlib/AMBuilder'
+ 'third_party/zlib/AMBuilder'
+)
+
+AMXX.hashing = builder.RunScript(
+ 'third_party/hashing/AMBuilder'
)
builder.RunBuildScripts(
diff --git a/amxmodx/AMBuilder b/amxmodx/AMBuilder
index df938308..aa5f4127 100644
--- a/amxmodx/AMBuilder
+++ b/amxmodx/AMBuilder
@@ -32,7 +32,7 @@ elif builder.target_platform == 'windows':
]
binary.compiler.linkflags += jit_objects
-binary.compiler.linkflags += [AMXX.zlib.binary]
+binary.compiler.linkflags += [AMXX.zlib.binary, AMXX.hashing.binary]
if builder.target_platform == 'mac':
binary.compiler.postlink += [
@@ -93,13 +93,6 @@ binary.sources = [
'cvars.cpp',
'../public/memtools/CDetour/detours.cpp',
'../public/memtools/CDetour/asm/asm.c',
- '../public/hashing/hashing.cpp',
- '../public/hashing/hashers/crc32.cpp',
- '../public/hashing/hashers/md5.cpp',
- '../public/hashing/hashers/sha1.cpp',
- '../public/hashing/hashers/sha256.cpp',
- '../public/hashing/hashers/sha3.cpp',
- '../public/hashing/hashers/keccak.cpp'
]
if builder.target_platform == 'windows':
diff --git a/amxmodx/msvc12/amxmodx_mm.sln b/amxmodx/msvc12/amxmodx_mm.sln
index 185701c2..a6b0a1ae 100644
--- a/amxmodx/msvc12/amxmodx_mm.sln
+++ b/amxmodx/msvc12/amxmodx_mm.sln
@@ -1,6 +1,8 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxmodx_mm", "amxmodx_mm.vcxproj", "{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{1A75873D-E05D-4F07-A4E2-28DC1BB03226}"
@@ -59,18 +61,18 @@ Global
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Debug|Win32.ActiveCfg = JITDebugBinLog|Win32
- {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Debug|Win32.Build.0 = JITDebugBinLog|Win32
+ {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Debug|Win32.ActiveCfg = JITDebug|Win32
+ {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Debug|Win32.Build.0 = JITDebug|Win32
{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug|Win32.ActiveCfg = JITDebug|Win32
{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug|Win32.Build.0 = JITDebug|Win32
- {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebugBinLog|Win32.ActiveCfg = JITDebugBinLog|Win32
- {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebugBinLog|Win32.Build.0 = JITDebugBinLog|Win32
+ {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebugBinLog|Win32.ActiveCfg = JITDebug|Win32
+ {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebugBinLog|Win32.Build.0 = JITDebug|Win32
{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITRelease|Win32.ActiveCfg = JITRelease|Win32
{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITRelease|Win32.Build.0 = JITRelease|Win32
- {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITReleaseBinLog|Win32.ActiveCfg = JITReleaseBinLog|Win32
- {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITReleaseBinLog|Win32.Build.0 = JITReleaseBinLog|Win32
- {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Release|Win32.ActiveCfg = JITReleaseBinLog|Win32
- {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Release|Win32.Build.0 = JITReleaseBinLog|Win32
+ {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITReleaseBinLog|Win32.ActiveCfg = JITRelease|Win32
+ {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITReleaseBinLog|Win32.Build.0 = JITRelease|Win32
+ {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Release|Win32.ActiveCfg = JITRelease|Win32
+ {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Release|Win32.Build.0 = JITRelease|Win32
{AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Debug|Win32.ActiveCfg = Debug|Win32
{AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Debug|Win32.Build.0 = Debug|Win32
{AB148B92-4F47-42E6-8268-AB4E588EC6A2}.JITDebug|Win32.ActiveCfg = Debug|Win32
@@ -119,6 +121,7 @@ Global
{2742C607-9FAB-47B3-8A13-E999BC6FDB54}.JITReleaseBinLog|Win32.Build.0 = Release|Win32
{2742C607-9FAB-47B3-8A13-E999BC6FDB54}.Release|Win32.ActiveCfg = Release|Win32
{2742C607-9FAB-47B3-8A13-E999BC6FDB54}.Release|Win32.Build.0 = Release|Win32
+ {2742C607-9FAB-47B3-8A13-E999BC6FDB54}.Release|Win32.Deploy.0 = Release|Win32
{9008A886-2DD0-443C-B468-AD84868D89B0}.Debug|Win32.ActiveCfg = Debug|Win32
{9008A886-2DD0-443C-B468-AD84868D89B0}.Debug|Win32.Build.0 = Debug|Win32
{9008A886-2DD0-443C-B468-AD84868D89B0}.JITDebug|Win32.ActiveCfg = Debug|Win32
diff --git a/amxmodx/msvc12/amxmodx_mm.vcxproj b/amxmodx/msvc12/amxmodx_mm.vcxproj
index 3dce4c3c..3378a72a 100644
--- a/amxmodx/msvc12/amxmodx_mm.vcxproj
+++ b/amxmodx/msvc12/amxmodx_mm.vcxproj
@@ -1,18 +1,10 @@
-
- JITDebugBinLog
- Win32
-
JITDebug
Win32
-
- JITReleaseBinLog
- Win32
-
JITRelease
Win32
@@ -23,18 +15,6 @@
amxmodx
-
- DynamicLibrary
- false
- MultiByte
- v120_xp
-
-
- DynamicLibrary
- false
- MultiByte
- v120_xp
-
DynamicLibrary
false
@@ -50,14 +30,6 @@
-
-
-
-
-
-
-
-
@@ -71,17 +43,9 @@
<_ProjectFileVersion>10.0.40219.1
true
false
- true
- false
- AllRules.ruleset
-
-
AllRules.ruleset
- AllRules.ruleset
-
-
AllRules.ruleset
@@ -96,8 +60,8 @@
Disabled
- ..\;..\..\public;..\..\public\memtools;..\..\public\sdk;..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;PAWN_CELL_SIZE=32;ASM32;JIT;_CRT_SECURE_NO_DEPRECATE;HAVE_STDINT_H;%(PreprocessorDefinitions)
+ ..\;..\..\public;..\..\public\memtools;..\..\third_party;..\..\third_party\zlib;..\..\third_party\hashing;..\..\public\sdk;..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;PAWN_CELL_SIZE=32;ASM32;JIT;_CRT_SECURE_NO_DEPRECATE;HAVE_STDINT_H;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
4Bytes
@@ -107,9 +71,6 @@
amxmodx.h
.\jitdebug/amxmodx.pch
- .\jitdebug/
- .\jitdebug/
- .\jitdebug/
Level3
true
EditAndContinue
@@ -149,8 +110,8 @@
true
Speed
true
- ..\;..\..\public;..\..\public\memtools;..\..\public\hashing;..\..\public\sdk;..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT;ASM32;PAWN_CELL_SIZE=32;_CRT_SECURE_NO_DEPRECATE;HAVE_STDINT_H;%(PreprocessorDefinitions)
+ ..\;..\..\public;..\..\public\memtools;..\..\third_party;..\..\third_party\zlib;..\..\third_party\hashing;..\..\third_party;..\..\third_party\hashing;..\..\public\sdk;..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT;ASM32;PAWN_CELL_SIZE=32;HAVE_STDINT_H;%(PreprocessorDefinitions)
false
true
MultiThreaded
@@ -159,16 +120,12 @@
false
- amxmodx.h
- .\jitrelease/amxmodx.pch
- .\jitrelease/
- .\jitrelease/
- .\jitrelease/
Level3
true
ProgramDatabase
Default
false
+ amxmodx.h
NDEBUG;%(PreprocessorDefinitions)
@@ -190,132 +147,97 @@
false
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
- .\debug/amxmodx.tlb
-
-
- Disabled
- ..\;..\..\public;..\..\public\memtools;..\..\public\sdk;..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;PAWN_CELL_SIZE=32;ASM32;JIT;BINLOG_ENABLED;_CRT_SECURE_NO_DEPRECATE;HAVE_STDINT_H;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreaded
- 4Bytes
- true
- false
-
-
- amxmodx.h
- .\jitdebugbinlog/amxmodx.pch
- .\jitdebugbinlog/
- .\jitdebugbinlog/
- .\jitdebugbinlog/
- Level3
- true
- EditAndContinue
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- /MACHINE:I386 %(AdditionalOptions)
- ..\JIT\amxjitsn.obj;..\JIT\amxexecn.obj;..\JIT\natives-x86.obj;%(AdditionalDependencies)
- 0.1
- true
- ..\extra\lib_win32;%(AdditionalLibraryDirectories)
- LIBC;LIBCD;LIBCMT;%(IgnoreSpecificDefaultLibraries)
-
-
- true
- .\jitdebugbinlog/amxmodx_bl_mm.pdb
- .\jitdebugbinlog/amxmodx_bl_mm.lib
- Windows
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
- .\release/amxmodx.tlb
-
-
- MaxSpeed
- OnlyExplicitInline
- true
- Speed
- true
- ..\;..\..\public;..\..\public\memtools;..\..\public\sdk;..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;HAVE_STDINT_H;_USRDLL;amxmodx_EXPORTS;JIT;ASM32;PAWN_CELL_SIZE=32;BINLOG_ENABLED;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- false
- true
- MultiThreaded
- true
- true
- false
-
-
- amxmodx.h
- .\jitreleasebinlog/amxmodx.pch
- .\jitreleasebinlog/
- .\jitreleasebinlog/
- .\jitreleasebinlog/
- Level3
- true
- ProgramDatabase
- Default
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- /MACHINE:I386 %(AdditionalOptions)
- ..\JIT\amxjitsn.obj;..\JIT\amxexecn.obj;..\JIT\natives-x86.obj;%(AdditionalDependencies)
- true
- ..\extra\lib_win32;%(AdditionalLibraryDirectories)
- LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries)
-
-
- true
- .\jitreleasebinlog/amxmodx_bl_mm.pdb
- true
- .\jitreleasebinlog/amxmodx_bl_mm.lib
- Windows
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ $(IntDir)hashing\
+ $(IntDir)hashing\
+
+
+ $(IntDir)hashing\
+ $(IntDir)hashing\
+
+
+ $(IntDir)hashing\
+ $(IntDir)hashing\
+
+
+ $(IntDir)hashing\
+ $(IntDir)hashing\
+
+
+ $(IntDir)hashing\
+ $(IntDir)hashing\
+
+
+ $(IntDir)hashing\
+ $(IntDir)hashing\
+
+
+ $(IntDir)hashing\
+ $(IntDir)hashing\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
@@ -351,7 +273,6 @@
- AssemblyAndSourceCode
AssemblyAndSourceCode
@@ -367,7 +288,6 @@
- All
All
@@ -378,9 +298,7 @@
- true
true
- true
true
@@ -388,13 +306,24 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -432,15 +361,11 @@
-
-
-
-
@@ -480,9 +405,7 @@
-
+
diff --git a/amxmodx/msvc12/amxmodx_mm.vcxproj.filters b/amxmodx/msvc12/amxmodx_mm.vcxproj.filters
index 6bb975e5..7c34bc41 100644
--- a/amxmodx/msvc12/amxmodx_mm.vcxproj.filters
+++ b/amxmodx/msvc12/amxmodx_mm.vcxproj.filters
@@ -34,13 +34,17 @@
{64a22cd4-3715-45de-8af2-e54017733be6}
-
- {c9218ea1-c21e-4b90-b7a2-cb665d905a3f}
+
+ {080705f5-5e95-4251-a521-e1671b60a989}
-
- {v3248ea1-a53v-5ax5-b2d1-f3gh53d2fg43}
-
- {2b925879-cb15-4a3d-9236-cf43eaf6b3cf}
+
+ {7cc6a54c-6244-43e9-85ac-c2fb76bd92bc}
+
+
+ {06763df9-3070-414e-b666-080b079f4319}
+
+
+ {fb5fd616-bb2e-42f1-a113-a61eb9ead739}
@@ -98,9 +102,6 @@
Source Files
-
- Source Files
-
Source Files
@@ -209,70 +210,74 @@
Source Files
-
- Hashing
+
+ Third Party\Zlib
-
- Hashing\Hashers
+
+ Third Party\Zlib
-
- Hashing\Hashers
+
+ Third Party\Zlib
-
- Hashing\Hashers
+
+ Third Party\Zlib
-
- Hashing\Hashers
+
+ Third Party\Zlib
-
- Hashing\Hashers
+
+ Third Party\Zlib
-
- Hashing\Hashers
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Hashing
-
- Source Files\zlib
+
+ Third Party\Hashing\hashers
-
- Source Files\zlib
+
+ Third Party\Hashing\hashers
-
- Source Files\zlib
+
+ Third Party\Hashing\hashers
-
- Source Files\zlib
+
+ Third Party\Hashing\hashers
-
- Source Files\zlib
+
+ Third Party\Hashing\hashers
+
+
+ Third Party\Hashing\hashers
+
+
+ Source Files
@@ -378,9 +383,6 @@
Header Files
-
- Header Files
-
Header Files
@@ -390,18 +392,9 @@
Header Files
-
- Header Files
-
Header Files
-
- Header Files
-
-
- Header Files
-
Header Files
@@ -429,26 +422,59 @@
Header Files
-
- Hashing
+
+ Third Party\Zlib
-
- Hashing\Hashers
+
+ Third Party\Zlib
-
- Hashing\Hashers
+
+ Third Party\Zlib
-
- Hashing\Hashers
+
+ Third Party\Zlib
-
- Hashing\Hashers
+
+ Third Party\Zlib
-
- Hashing\Hashers
+
+ Third Party\Zlib
-
- Hashing\Hashers
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Hashing
+
+
+ Third Party\Hashing\hashers
+
+
+ Third Party\Hashing\hashers
+
+
+ Third Party\Hashing\hashers
+
+
+ Third Party\Hashing\hashers
+
+
+ Third Party\Hashing\hashers
+
+
+ Third Party\Hashing\hashers
diff --git a/compiler/amxxpc/amxxpc.vcxproj b/compiler/amxxpc/amxxpc.vcxproj
index 9596c656..282631ef 100644
--- a/compiler/amxxpc/amxxpc.vcxproj
+++ b/compiler/amxxpc/amxxpc.vcxproj
@@ -55,7 +55,7 @@
Disabled
- WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;AMX_ANSIONLY;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE; AMX_ANSIONLY;%(PreprocessorDefinitions)
true
EnableFastChecks
MultiThreaded
@@ -64,7 +64,7 @@
Level3
EditAndContinue
- ..\..\public;..\..\public\zlib;..\..\amxmodx\;C:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)
+ ..\..\public;..\..\third_party;..\..\third_party\zlib;..\..\amxmodx\;C:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)
%(AdditionalDependencies)
@@ -77,7 +77,7 @@
- WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;AMX_ANSIONLY;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE; AMX_ANSIONLY;%(PreprocessorDefinitions)
MultiThreaded
Default
false
@@ -85,7 +85,7 @@
Level3
ProgramDatabase
- ..\..\public;..\..\public\zlib;..\..\amxmodx\;C:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)
+ ..\..\public;..\..\third_party;..\..\third_party\zlib;..\..\amxmodx\;C:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)
%(AdditionalDependencies)
@@ -97,26 +97,76 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+
+
+
+
+
+
+
+
+
+
@@ -125,8 +175,6 @@
-
-
diff --git a/compiler/amxxpc/amxxpc.vcxproj.filters b/compiler/amxxpc/amxxpc.vcxproj.filters
index f207ebee..eef8f7fd 100644
--- a/compiler/amxxpc/amxxpc.vcxproj.filters
+++ b/compiler/amxxpc/amxxpc.vcxproj.filters
@@ -13,7 +13,10 @@
{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx
-
+
+ {a466b006-d6ae-4373-a202-01d9da71b138}
+
+
{dc85e679-8bc3-49f7-8823-b761223c8e8e}
@@ -27,50 +30,50 @@
Source Files
-
- zlib
+
+ Third Party\Zlib
-
- zlib
+
+ Third Party\Zlib
-
- zlib
+
+ Third Party\Zlib
-
- zlib
+
+ Third Party\Zlib
-
- zlib
+
+ Third Party\Zlib
-
- zlib
+
+ Third Party\Zlib
-
- zlib
+
+ Third Party\Zlib
-
- zlib
+
+ Third Party\Zlib
-
- zlib
+
+ Third Party\Zlib
-
- zlib
+
+ Third Party\Zlib
-
- zlib
+
+ Third Party\Zlib
-
- zlib
+
+ Third Party\Zlib
-
- zlib
+
+ Third Party\Zlib
-
- zlib
+
+ Third Party\Zlib
-
- zlib
+
+ Third Party\Zlib
@@ -98,11 +101,38 @@
Header Files
-
- Header Files
+
+ Third Party\Zlib
-
- Header Files
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
diff --git a/compiler/libpc300/sc2.c b/compiler/libpc300/sc2.c
index 266597c3..9b8e83ed 100755
--- a/compiler/libpc300/sc2.c
+++ b/compiler/libpc300/sc2.c
@@ -1936,7 +1936,7 @@ char *sc_tokens[] = {
SC_FUNC int lex(cell *lexvalue,char **lexsym)
{
- int i,toolong,newline,stringflags;
+ int i,toolong,newline;
char **tokptr;
const unsigned char *starttoken;
diff --git a/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj b/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj
index c0bdfc40..98f84d2e 100644
--- a/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj
+++ b/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj
@@ -64,7 +64,7 @@
Disabled
- ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\public\hashing;..\..\..\..\public\memtools;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\..\..\..\public\memtools;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_STDINT_H;_CRT_SECURE_NO_DEPRECATE;CSTRIKE_EXPORTS;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
@@ -110,7 +110,7 @@
MaxSpeed
OnlyExplicitInline
- ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\public\hashing;..\..\..\..\public\memtools;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\..\..\..\public\memtools;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_STDINT_H;_CRT_SECURE_NO_DEPRECATE;CSTRIKE_EXPORTS;%(PreprocessorDefinitions)
true
MultiThreaded
@@ -146,6 +146,7 @@
+
diff --git a/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj.filters b/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj.filters
index 49059432..be95ef31 100644
--- a/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj.filters
+++ b/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj.filters
@@ -56,6 +56,9 @@
Module SDK\SDK Base
+
+ Source Files
+
diff --git a/dlls/cstrike/csx/WinCSX/msvc12/WinCSX.vcxproj b/dlls/cstrike/csx/WinCSX/msvc12/WinCSX.vcxproj
index 957a5c5e..22ea59f4 100644
--- a/dlls/cstrike/csx/WinCSX/msvc12/WinCSX.vcxproj
+++ b/dlls/cstrike/csx/WinCSX/msvc12/WinCSX.vcxproj
@@ -52,7 +52,7 @@
Disabled
- ..\;..\..\..\..\..\public;..\..\..\..\..\public\sdk; ..\..\..\..\..\public\amtl\include;..\..\public\hashing;..\resources;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\..\..\public;..\..\..\..\..\public\sdk; ..\..\..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\resources;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -73,7 +73,7 @@
- ..\;..\..\..\..\..\public;..\..\..\..\..\public\sdk; ..\..\..\..\..\public\amtl\include;..\..\public\hashing;..\resources;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\..\..\public;..\..\..\..\..\public\sdk; ..\..\..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\resources;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
MultiThreaded
Use
diff --git a/dlls/cstrike/csx/msvc12/csx.vcxproj b/dlls/cstrike/csx/msvc12/csx.vcxproj
index b87f4324..cacad209 100644
--- a/dlls/cstrike/csx/msvc12/csx.vcxproj
+++ b/dlls/cstrike/csx/msvc12/csx.vcxproj
@@ -65,7 +65,7 @@
MaxSpeed
OnlyExplicitInline
- ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;csx_EXPORTS;JIT;%(PreprocessorDefinitions)
true
MultiThreaded
@@ -107,7 +107,7 @@
Disabled
- ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;csx_EXPORTS;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
diff --git a/dlls/dod/dodfun/msvc12/dodfun.vcxproj b/dlls/dod/dodfun/msvc12/dodfun.vcxproj
index 784345eb..4a6491cd 100644
--- a/dlls/dod/dodfun/msvc12/dodfun.vcxproj
+++ b/dlls/dod/dodfun/msvc12/dodfun.vcxproj
@@ -64,7 +64,7 @@
MaxSpeed
OnlyExplicitInline
- ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
dodfun_EXPORTS;%(PreprocessorDefinitions)
true
MultiThreaded
@@ -106,7 +106,7 @@
Disabled
- ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;dodfun_EXPORTS;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
diff --git a/dlls/dod/dodx/msvc12/dodx.vcxproj b/dlls/dod/dodx/msvc12/dodx.vcxproj
index 004ff642..de19087c 100644
--- a/dlls/dod/dodx/msvc12/dodx.vcxproj
+++ b/dlls/dod/dodx/msvc12/dodx.vcxproj
@@ -64,7 +64,7 @@
MaxSpeed
OnlyExplicitInline
- ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
dodx_EXPORTS;%(PreprocessorDefinitions)
true
MultiThreaded
@@ -106,7 +106,7 @@
Disabled
- ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;dodx_EXPORTS;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
diff --git a/dlls/engine/msvc12/engine.vcxproj b/dlls/engine/msvc12/engine.vcxproj
index 73e4bd93..88b4f687 100644
--- a/dlls/engine/msvc12/engine.vcxproj
+++ b/dlls/engine/msvc12/engine.vcxproj
@@ -54,7 +54,7 @@
Disabled
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;ENGINE_EXPORTS;HAVE_STDINT_H;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -78,7 +78,7 @@
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;ENGINE_EXPORTS;HAVE_STDINT_H;%(PreprocessorDefinitions)
MultiThreaded
4Bytes
diff --git a/dlls/fakemeta/msvc12/fakemeta.vcxproj b/dlls/fakemeta/msvc12/fakemeta.vcxproj
index c1fb74ec..cb50a1ce 100644
--- a/dlls/fakemeta/msvc12/fakemeta.vcxproj
+++ b/dlls/fakemeta/msvc12/fakemeta.vcxproj
@@ -54,7 +54,7 @@
Disabled
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;FAKEMETA_EXPORTS;HAVE_STDINT_H;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -77,7 +77,7 @@
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;FAKEMETA_EXPORTS;HAVE_STDINT_H;%(PreprocessorDefinitions)
MultiThreaded
false
diff --git a/dlls/fun/msvc12/fun.vcxproj b/dlls/fun/msvc12/fun.vcxproj
index 25a1c13a..3d4d8fbd 100644
--- a/dlls/fun/msvc12/fun.vcxproj
+++ b/dlls/fun/msvc12/fun.vcxproj
@@ -65,7 +65,7 @@
MaxSpeed
OnlyExplicitInline
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;FUN_EXPORTS;%(PreprocessorDefinitions)
true
MultiThreaded
@@ -107,7 +107,7 @@
Disabled
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;FUN_EXPORTS;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
diff --git a/dlls/geoip/msvc12/geoip.vcxproj b/dlls/geoip/msvc12/geoip.vcxproj
index c83f8fdd..ab8ec0a8 100644
--- a/dlls/geoip/msvc12/geoip.vcxproj
+++ b/dlls/geoip/msvc12/geoip.vcxproj
@@ -54,7 +54,7 @@
Disabled
- ..\;..\sdk;..\..\..\public;..\..\..\public\amtl\include;..\..\public\hashing;..\..\..\public\sdk;..\GeoIP2;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\sdk;..\..\..\public;..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\..\..\public\sdk;..\GeoIP2;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOIP_EXPORTS;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -78,7 +78,7 @@
- ..\;..\sdk;..\..\..\public;..\..\..\public\amtl\include;..\..\public\hashing;..\..\..\public\sdk;..\GeoIP2;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\sdk;..\..\..\public;..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\..\..\public\sdk;..\GeoIP2;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOIP_EXPORTS;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
MultiThreaded
false
@@ -98,7 +98,7 @@
-
+
@@ -120,4 +120,4 @@
-
+
\ No newline at end of file
diff --git a/dlls/geoip/msvc12/geoip.vcxproj.filters b/dlls/geoip/msvc12/geoip.vcxproj.filters
index c8b800d8..55581204 100644
--- a/dlls/geoip/msvc12/geoip.vcxproj.filters
+++ b/dlls/geoip/msvc12/geoip.vcxproj.filters
@@ -23,9 +23,6 @@
-
- GeoIP2
-
Source Files
@@ -38,6 +35,9 @@
Module SDK\SDK Base
+
+ GeoIP2
+
@@ -70,4 +70,4 @@
Pawn Includes
-
+
\ No newline at end of file
diff --git a/dlls/hamsandwich/msvc12/hamsandwich.vcxproj b/dlls/hamsandwich/msvc12/hamsandwich.vcxproj
index b833c1e3..737da5d0 100644
--- a/dlls/hamsandwich/msvc12/hamsandwich.vcxproj
+++ b/dlls/hamsandwich/msvc12/hamsandwich.vcxproj
@@ -54,7 +54,7 @@
Disabled
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;HAMSANDWICH_EXPORTS; HAVE_STDINT_H;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -81,7 +81,7 @@
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;HAMSANDWICH_EXPORTS; HAVE_STDINT_H;%(PreprocessorDefinitions)
MultiThreaded
false
diff --git a/dlls/mysqlx/msvc12/mysqlx.vcxproj b/dlls/mysqlx/msvc12/mysqlx.vcxproj
index 3fac4dfa..5b704498 100644
--- a/dlls/mysqlx/msvc12/mysqlx.vcxproj
+++ b/dlls/mysqlx/msvc12/mysqlx.vcxproj
@@ -54,8 +54,8 @@
Disabled
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;..\..\..\..\mysql-5.0\include;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;$(MYSQL5)\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;_USRDLL;MYSQL2_EXPORTS;SM_DEFAULT_THREADER;HAVE_STDINT_H;%(PreprocessorDefinitions)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\..\..\..\mysql-5.0\include;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;$(MYSQL5)\include;%(AdditionalIncludeDirectories)
+ WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_ITERATOR_DEBUG_LEVEL=0;_DEBUG;_WINDOWS;_USRDLL;MYSQL2_EXPORTS;SM_DEFAULT_THREADER;HAVE_STDINT_H;%(PreprocessorDefinitions)
true
EnableFastChecks
MultiThreadedDebug
@@ -78,8 +78,8 @@
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;..\..\..\..\mysql-5.0\include;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;$(MYSQL5)\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;_USRDLL;MYSQL2_EXPORTS;SM_DEFAULT_THREADER;HAVE_STDINT_H;%(PreprocessorDefinitions)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\..\..\..\mysql-5.0\include;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;$(MYSQL5)\include;%(AdditionalIncludeDirectories)
+ WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_ITERATOR_DEBUG_LEVEL=0;NDEBUG;_WINDOWS;_USRDLL;MYSQL2_EXPORTS;SM_DEFAULT_THREADER;HAVE_STDINT_H;%(PreprocessorDefinitions)
MultiThreaded
false
@@ -99,21 +99,66 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
+
+ $(IntDir)zlib\
+ $(IntDir)zlib\
+
@@ -129,6 +174,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dlls/mysqlx/msvc12/mysqlx.vcxproj.filters b/dlls/mysqlx/msvc12/mysqlx.vcxproj.filters
index 0c28895c..92502344 100644
--- a/dlls/mysqlx/msvc12/mysqlx.vcxproj.filters
+++ b/dlls/mysqlx/msvc12/mysqlx.vcxproj.filters
@@ -36,7 +36,10 @@
{05423057-6d62-454a-b5f8-b451d91be196}
-
+
+ {2753269b-35b5-4947-b0f3-806b3c39959a}
+
+
{557b0e54-eb0e-488f-b8bc-3cee3f8ddfba}
@@ -80,50 +83,50 @@
Module SDK\SDK Base
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
-
- Source Files\zlib
+
+ Third Party\Zlib
@@ -175,6 +178,39 @@
Module SDK\SDK Base
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
+
+ Third Party\Zlib
+
diff --git a/dlls/ns/msvc12/ns.vcxproj b/dlls/ns/msvc12/ns.vcxproj
index a1048dac..7f741586 100644
--- a/dlls/ns/msvc12/ns.vcxproj
+++ b/dlls/ns/msvc12/ns.vcxproj
@@ -65,7 +65,7 @@
MaxSpeed
OnlyExplicitInline
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
HAVE_STDINT_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS;%(PreprocessorDefinitions)
true
MultiThreaded
@@ -105,7 +105,7 @@
Disabled
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
HAVE_STDINT_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
diff --git a/dlls/nvault/msvc12/nvault.vcxproj b/dlls/nvault/msvc12/nvault.vcxproj
index 8588b711..3cde39d4 100644
--- a/dlls/nvault/msvc12/nvault.vcxproj
+++ b/dlls/nvault/msvc12/nvault.vcxproj
@@ -54,7 +54,7 @@
Disabled
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;NVAULT_EXPORTS;HAVE_STDINT_H;%(PreprocessorDefinitions)
true
Sync
@@ -79,7 +79,7 @@
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;NVAULT_EXPORTS;HAVE_STDINT_H;%(PreprocessorDefinitions)
MultiThreaded
4Bytes
diff --git a/dlls/regex/msvc12/regex.vcxproj b/dlls/regex/msvc12/regex.vcxproj
index a6bdd6e4..86105fe2 100644
--- a/dlls/regex/msvc12/regex.vcxproj
+++ b/dlls/regex/msvc12/regex.vcxproj
@@ -54,7 +54,7 @@
Disabled
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;REGEX_EXPORTS;HAVE_STDINT_H;PCRE_STATIC;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -78,7 +78,7 @@
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;REGEX_EXPORTS;HAVE_STDINT_H;PCRE_STATIC;%(PreprocessorDefinitions)
MultiThreaded
false
diff --git a/dlls/sockets/msvc12/sockets.vcxproj b/dlls/sockets/msvc12/sockets.vcxproj
index 33e0be96..5205ba13 100644
--- a/dlls/sockets/msvc12/sockets.vcxproj
+++ b/dlls/sockets/msvc12/sockets.vcxproj
@@ -54,7 +54,7 @@
Disabled
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;SOCKETS_EXPORTS;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -78,7 +78,7 @@
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;SOCKETS_EXPORTS;%(PreprocessorDefinitions)
MultiThreaded
false
diff --git a/dlls/sqlite/msvc12/sqlite.vcxproj b/dlls/sqlite/msvc12/sqlite.vcxproj
index 974406e9..b9e04458 100644
--- a/dlls/sqlite/msvc12/sqlite.vcxproj
+++ b/dlls/sqlite/msvc12/sqlite.vcxproj
@@ -55,7 +55,7 @@
/D "NO_TCL" %(AdditionalOptions)
Disabled
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;..\sqlite-source;..\sqlitepp;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\sqlite-source;..\sqlitepp;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;sqlite_EXPORTS;SM_DEFAULT_THREADER;HAVE_STDINT_H;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -85,7 +85,7 @@
MaxSpeed
OnlyExplicitInline
true
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;..\sqlite-source;..\sqlitepp;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\sqlite-source;..\sqlitepp;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;sqlite_EXPORTS;SM_DEFAULT_THREADER;HAVE_STDINT_H;%(PreprocessorDefinitions)
true
MultiThreaded
diff --git a/dlls/tfcx/msvc12/tfcx.vcxproj b/dlls/tfcx/msvc12/tfcx.vcxproj
index 0b886881..7f10b3a9 100644
--- a/dlls/tfcx/msvc12/tfcx.vcxproj
+++ b/dlls/tfcx/msvc12/tfcx.vcxproj
@@ -63,7 +63,7 @@
Disabled
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;tfcx_EXPORTS;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
@@ -108,7 +108,7 @@
MaxSpeed
OnlyExplicitInline
- ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;tfcx_EXPORTS;%(PreprocessorDefinitions)
true
MultiThreaded
diff --git a/dlls/ts/tsfun/msvc12/tsfun.vcxproj b/dlls/ts/tsfun/msvc12/tsfun.vcxproj
index 399917b2..a3537ca2 100644
--- a/dlls/ts/tsfun/msvc12/tsfun.vcxproj
+++ b/dlls/ts/tsfun/msvc12/tsfun.vcxproj
@@ -64,7 +64,7 @@
Disabled
- ..\;..\..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;TSFUN_EXPORTS;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -109,7 +109,7 @@
MaxSpeed
OnlyExplicitInline
- ..\;..\..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;TSFUN_EXPORTS;%(PreprocessorDefinitions)
true
MultiThreaded
diff --git a/dlls/ts/tsx/msvc12/tsx.vcxproj b/dlls/ts/tsx/msvc12/tsx.vcxproj
index 56a09075..0411cb69 100644
--- a/dlls/ts/tsx/msvc12/tsx.vcxproj
+++ b/dlls/ts/tsx/msvc12/tsx.vcxproj
@@ -63,7 +63,7 @@
Disabled
- ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;tsx_amxx_EXPORTS;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
@@ -108,7 +108,7 @@
MaxSpeed
OnlyExplicitInline
- ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\public\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
+ ..\;..\..\..\..\public;..\..\..\..\public\sdk; ..\..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)
tsx_amxx_EXPORTS;%(PreprocessorDefinitions)
true
MultiThreaded
diff --git a/third_party/hashing/AMBuilder b/third_party/hashing/AMBuilder
new file mode 100644
index 00000000..508cae53
--- /dev/null
+++ b/third_party/hashing/AMBuilder
@@ -0,0 +1,20 @@
+# vim: sts=2 ts=8 sw=2 tw=99 et ft=python:
+import os, platform
+
+lib = builder.compiler.StaticLibrary('hashinglib')
+
+lib.compiler.includes += [
+ os.path.join(builder.sourcePath, 'third_party', 'hashing'),
+]
+
+lib.sources += [
+ 'hashing.cpp',
+ 'hashers/crc32.cpp',
+ 'hashers/keccak.cpp',
+ 'hashers/md5.cpp',
+ 'hashers/sha1.cpp',
+ 'hashers/sha3.cpp',
+ 'hashers/sha256.cpp',
+]
+
+rvalue = builder.Add(lib)
diff --git a/public/hashing/hashers/crc32.cpp b/third_party/hashing/hashers/crc32.cpp
similarity index 100%
rename from public/hashing/hashers/crc32.cpp
rename to third_party/hashing/hashers/crc32.cpp
diff --git a/public/hashing/hashers/crc32.h b/third_party/hashing/hashers/crc32.h
similarity index 100%
rename from public/hashing/hashers/crc32.h
rename to third_party/hashing/hashers/crc32.h
diff --git a/public/hashing/hashers/keccak.cpp b/third_party/hashing/hashers/keccak.cpp
similarity index 100%
rename from public/hashing/hashers/keccak.cpp
rename to third_party/hashing/hashers/keccak.cpp
diff --git a/public/hashing/hashers/keccak.h b/third_party/hashing/hashers/keccak.h
similarity index 100%
rename from public/hashing/hashers/keccak.h
rename to third_party/hashing/hashers/keccak.h
diff --git a/public/hashing/hashers/md5.cpp b/third_party/hashing/hashers/md5.cpp
similarity index 100%
rename from public/hashing/hashers/md5.cpp
rename to third_party/hashing/hashers/md5.cpp
diff --git a/public/hashing/hashers/md5.h b/third_party/hashing/hashers/md5.h
similarity index 100%
rename from public/hashing/hashers/md5.h
rename to third_party/hashing/hashers/md5.h
diff --git a/public/hashing/hashers/sha1.cpp b/third_party/hashing/hashers/sha1.cpp
similarity index 100%
rename from public/hashing/hashers/sha1.cpp
rename to third_party/hashing/hashers/sha1.cpp
diff --git a/public/hashing/hashers/sha1.h b/third_party/hashing/hashers/sha1.h
similarity index 100%
rename from public/hashing/hashers/sha1.h
rename to third_party/hashing/hashers/sha1.h
diff --git a/public/hashing/hashers/sha256.cpp b/third_party/hashing/hashers/sha256.cpp
similarity index 100%
rename from public/hashing/hashers/sha256.cpp
rename to third_party/hashing/hashers/sha256.cpp
diff --git a/public/hashing/hashers/sha256.h b/third_party/hashing/hashers/sha256.h
similarity index 100%
rename from public/hashing/hashers/sha256.h
rename to third_party/hashing/hashers/sha256.h
diff --git a/public/hashing/hashers/sha3.cpp b/third_party/hashing/hashers/sha3.cpp
similarity index 100%
rename from public/hashing/hashers/sha3.cpp
rename to third_party/hashing/hashers/sha3.cpp
diff --git a/public/hashing/hashers/sha3.h b/third_party/hashing/hashers/sha3.h
similarity index 100%
rename from public/hashing/hashers/sha3.h
rename to third_party/hashing/hashers/sha3.h
diff --git a/public/hashing/hashing.cpp b/third_party/hashing/hashing.cpp
similarity index 100%
rename from public/hashing/hashing.cpp
rename to third_party/hashing/hashing.cpp
diff --git a/public/hashing/hashing.h b/third_party/hashing/hashing.h
similarity index 100%
rename from public/hashing/hashing.h
rename to third_party/hashing/hashing.h
diff --git a/public/zlib/AMBuilder b/third_party/zlib/AMBuilder
similarity index 87%
rename from public/zlib/AMBuilder
rename to third_party/zlib/AMBuilder
index eb393e77..cfef2b9e 100644
--- a/public/zlib/AMBuilder
+++ b/third_party/zlib/AMBuilder
@@ -4,7 +4,7 @@ import os, platform
lib = builder.compiler.StaticLibrary('zlib')
lib.compiler.includes += [
- os.path.join(builder.sourcePath, 'public', 'zlib'),
+ os.path.join(builder.sourcePath, 'third_party', 'zlib'),
]
lib.sources += [
diff --git a/public/zlib/adler32.c b/third_party/zlib/adler32.c
similarity index 100%
rename from public/zlib/adler32.c
rename to third_party/zlib/adler32.c
diff --git a/public/zlib/compress.c b/third_party/zlib/compress.c
similarity index 100%
rename from public/zlib/compress.c
rename to third_party/zlib/compress.c
diff --git a/public/zlib/crc32.c b/third_party/zlib/crc32.c
similarity index 100%
rename from public/zlib/crc32.c
rename to third_party/zlib/crc32.c
diff --git a/public/zlib/crc32.h b/third_party/zlib/crc32.h
similarity index 100%
rename from public/zlib/crc32.h
rename to third_party/zlib/crc32.h
diff --git a/public/zlib/deflate.c b/third_party/zlib/deflate.c
similarity index 100%
rename from public/zlib/deflate.c
rename to third_party/zlib/deflate.c
diff --git a/public/zlib/deflate.h b/third_party/zlib/deflate.h
similarity index 100%
rename from public/zlib/deflate.h
rename to third_party/zlib/deflate.h
diff --git a/public/zlib/gzclose.c b/third_party/zlib/gzclose.c
similarity index 100%
rename from public/zlib/gzclose.c
rename to third_party/zlib/gzclose.c
diff --git a/public/zlib/gzguts.h b/third_party/zlib/gzguts.h
similarity index 100%
rename from public/zlib/gzguts.h
rename to third_party/zlib/gzguts.h
diff --git a/public/zlib/gzlib.c b/third_party/zlib/gzlib.c
similarity index 100%
rename from public/zlib/gzlib.c
rename to third_party/zlib/gzlib.c
diff --git a/public/zlib/gzread.c b/third_party/zlib/gzread.c
similarity index 100%
rename from public/zlib/gzread.c
rename to third_party/zlib/gzread.c
diff --git a/public/zlib/gzwrite.c b/third_party/zlib/gzwrite.c
similarity index 100%
rename from public/zlib/gzwrite.c
rename to third_party/zlib/gzwrite.c
diff --git a/public/zlib/infback.c b/third_party/zlib/infback.c
similarity index 100%
rename from public/zlib/infback.c
rename to third_party/zlib/infback.c
diff --git a/public/zlib/inffast.c b/third_party/zlib/inffast.c
similarity index 100%
rename from public/zlib/inffast.c
rename to third_party/zlib/inffast.c
diff --git a/public/zlib/inffast.h b/third_party/zlib/inffast.h
similarity index 100%
rename from public/zlib/inffast.h
rename to third_party/zlib/inffast.h
diff --git a/public/zlib/inffixed.h b/third_party/zlib/inffixed.h
similarity index 100%
rename from public/zlib/inffixed.h
rename to third_party/zlib/inffixed.h
diff --git a/public/zlib/inflate.c b/third_party/zlib/inflate.c
similarity index 100%
rename from public/zlib/inflate.c
rename to third_party/zlib/inflate.c
diff --git a/public/zlib/inflate.h b/third_party/zlib/inflate.h
similarity index 100%
rename from public/zlib/inflate.h
rename to third_party/zlib/inflate.h
diff --git a/public/zlib/inftrees.c b/third_party/zlib/inftrees.c
similarity index 100%
rename from public/zlib/inftrees.c
rename to third_party/zlib/inftrees.c
diff --git a/public/zlib/inftrees.h b/third_party/zlib/inftrees.h
similarity index 100%
rename from public/zlib/inftrees.h
rename to third_party/zlib/inftrees.h
diff --git a/public/zlib/trees.c b/third_party/zlib/trees.c
similarity index 100%
rename from public/zlib/trees.c
rename to third_party/zlib/trees.c
diff --git a/public/zlib/trees.h b/third_party/zlib/trees.h
similarity index 100%
rename from public/zlib/trees.h
rename to third_party/zlib/trees.h
diff --git a/public/zlib/uncompr.c b/third_party/zlib/uncompr.c
similarity index 100%
rename from public/zlib/uncompr.c
rename to third_party/zlib/uncompr.c
diff --git a/public/zlib/zconf.h b/third_party/zlib/zconf.h
similarity index 100%
rename from public/zlib/zconf.h
rename to third_party/zlib/zconf.h
diff --git a/public/zlib/zlib.h b/third_party/zlib/zlib.h
similarity index 100%
rename from public/zlib/zlib.h
rename to third_party/zlib/zlib.h
diff --git a/public/zlib/zutil.c b/third_party/zlib/zutil.c
similarity index 100%
rename from public/zlib/zutil.c
rename to third_party/zlib/zutil.c
diff --git a/public/zlib/zutil.h b/third_party/zlib/zutil.h
similarity index 100%
rename from public/zlib/zutil.h
rename to third_party/zlib/zutil.h