diff --git a/lib/linux64/libtier0.so b/lib/linux64/libtier0.so new file mode 100644 index 00000000..5b1b4348 Binary files /dev/null and b/lib/linux64/libtier0.so differ diff --git a/lib/linux64/libtier0_client.so b/lib/linux64/libtier0_client.so deleted file mode 100755 index 6a704223..00000000 Binary files a/lib/linux64/libtier0_client.so and /dev/null differ diff --git a/lib/linux64/libvstdlib.so b/lib/linux64/libvstdlib.so new file mode 100644 index 00000000..ed5b8f83 Binary files /dev/null and b/lib/linux64/libvstdlib.so differ diff --git a/lib/linux64/libvstdlib_client.so b/lib/linux64/libvstdlib_client.so deleted file mode 100755 index cf4844be..00000000 Binary files a/lib/linux64/libvstdlib_client.so and /dev/null differ diff --git a/lib/linux64/tier1.a b/lib/linux64/tier1.a index b0bf3529..c61545eb 100644 Binary files a/lib/linux64/tier1.a and b/lib/linux64/tier1.a differ diff --git a/lib/public/win64/tier0.lib b/lib/public/win64/tier0.lib new file mode 100644 index 00000000..c5206dbc Binary files /dev/null and b/lib/public/win64/tier0.lib differ diff --git a/lib/public/win64/tier1.lib b/lib/public/win64/tier1.lib new file mode 100644 index 00000000..4603b5c3 Binary files /dev/null and b/lib/public/win64/tier1.lib differ diff --git a/lib/public/win64/vstdlib.lib b/lib/public/win64/vstdlib.lib new file mode 100644 index 00000000..3c40e03c Binary files /dev/null and b/lib/public/win64/vstdlib.lib differ diff --git a/tier1/bitbuf.cpp b/tier1/bitbuf.cpp index f59956f1..60ccf346 100644 --- a/tier1/bitbuf.cpp +++ b/tier1/bitbuf.cpp @@ -352,7 +352,7 @@ bool bf_write::WriteBits(const void *pInData, int nBits) } // Align output to dword boundary - while (((unsigned long)pOut & 3) != 0 && nBitsLeft >= 8) + while (((uintp)pOut & 3) != 0 && nBitsLeft >= 8) { WriteUBitLong( *pOut, 8, false ); @@ -829,7 +829,7 @@ void old_bf_read::ReadBits(void *pOutData, int nBits) // align output to dword boundary - while( ((unsigned long)pOut & 3) != 0 && nBitsLeft >= 8 ) + while( ((uintp)pOut & 3) != 0 && nBitsLeft >= 8 ) { *pOut = (unsigned char)ReadUBitLong(8); ++pOut; diff --git a/tier1/convar.cpp b/tier1/convar.cpp index b7214a1f..fcd60095 100644 --- a/tier1/convar.cpp +++ b/tier1/convar.cpp @@ -961,7 +961,7 @@ void ConVar::Create( const char *pName, const char *pDefaultValue, int flags /*= m_pszDefaultValue = pDefaultValue ? pDefaultValue : empty_string; Assert( m_pszDefaultValue ); - m_Value.m_StringLength = strlen( m_pszDefaultValue ) + 1; + m_Value.m_StringLength = static_cast(strlen( m_pszDefaultValue ) + 1); m_Value.m_pszString = new char[m_Value.m_StringLength]; memcpy( m_Value.m_pszString, m_pszDefaultValue, m_Value.m_StringLength ); diff --git a/tier1/interface.cpp b/tier1/interface.cpp index dbad03a6..f750efb6 100644 --- a/tier1/interface.cpp +++ b/tier1/interface.cpp @@ -154,7 +154,7 @@ static HMODULE InternalLoadLibrary( const char *pName ) return LoadLibraryEx( pName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH ); #endif } -unsigned ThreadedLoadLibraryFunc( void *pParam ) +uintp ThreadedLoadLibraryFunc( void *pParam ) { ThreadedLoadLibaryContext_t *pContext = (ThreadedLoadLibaryContext_t*)pParam; pContext->m_hLibrary = InternalLoadLibrary(pContext->m_pLibraryName); diff --git a/tier1/newbitbuf.cpp b/tier1/newbitbuf.cpp index 39cfd217..8bd9d1b0 100644 --- a/tier1/newbitbuf.cpp +++ b/tier1/newbitbuf.cpp @@ -483,7 +483,7 @@ void CBitRead::ReadBits(void *pOutData, int nBits) // align output to dword boundary - while( ((unsigned long)pOut & 3) != 0 && nBitsLeft >= 8 ) + while( ((uintp)pOut & 3) != 0 && nBitsLeft >= 8 ) { *pOut = (unsigned char)ReadUBitLong(8); ++pOut; diff --git a/tier1/processor_detect.cpp b/tier1/processor_detect.cpp index a6bfe91b..09573d31 100644 --- a/tier1/processor_detect.cpp +++ b/tier1/processor_detect.cpp @@ -10,7 +10,7 @@ #include "processor_detect_linux.cpp" -#elif defined( _X360 ) +#elif defined( _X360 ) || defined( _WIN64 ) bool CheckMMXTechnology(void) { return false; } bool CheckSSETechnology(void) { return false; } diff --git a/tier1/tier1.sln b/tier1/tier1.sln index 0cf1abae..7e845a67 100644 --- a/tier1/tier1.sln +++ b/tier1/tier1.sln @@ -1,18 +1,26 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.7.34031.279 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tier1", "tier1.vcxproj", "{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Debug|Win32.ActiveCfg = Debug|Win32 {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Debug|Win32.Build.0 = Debug|Win32 + {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Debug|x64.ActiveCfg = Debug|x64 + {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Debug|x64.Build.0 = Debug|x64 {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Release|Win32.ActiveCfg = Release|Win32 {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Release|Win32.Build.0 = Release|Win32 + {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Release|x64.ActiveCfg = Release|x64 + {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tier1/tier1.vcxproj b/tier1/tier1.vcxproj index 8dcde3b3..b5b1eaa6 100644 --- a/tier1/tier1.vcxproj +++ b/tier1/tier1.vcxproj @@ -5,43 +5,74 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + tier1 {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} tier1 + 10.0 StaticLibrary + + StaticLibrary + v140_xp + StaticLibrary + + StaticLibrary + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\lib\public\ ..\lib\public\ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + + + + ..\lib\public\win64 @@ -77,6 +108,39 @@ + + + + + + + Disabled + ..\public;..\public\tier0;..\public\tier1;%(AdditionalIncludeDirectories) + _HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;WIN32;_WIN32;COMPILER_MSVC;COMPILER_MSVC64;_DEBUG;DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;TIER1_STATIC_LIB;%(PreprocessorDefinitions) + true + false + EnableFastChecks + MultiThreadedDebug + false + Fast + + + + + + + Level3 + + + + + + + Rpcrt4.lib;%(AdditionalDependencies) + + + + @@ -115,6 +179,44 @@ + + + + + + + MaxSpeed + AnySuitable + true + Speed + ..\public;..\public\tier0;..\public\tier1;%(AdditionalIncludeDirectories) + _HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;WIN32;_WIN32;COMPILER_MSVC;COMPILER_MSVC64;PLATFORM_64BITS;X64BITS;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;TIER1_STATIC_LIB;%(PreprocessorDefinitions) + true + false + MultiThreaded + false + true + Fast + + + + + + + Level3 + + + + + + + + + Rpcrt4.lib;%(AdditionalDependencies) + + + + @@ -134,7 +236,9 @@ Sync + Sync Sync + Sync