diff --git a/interfaces/interfaces.sln b/interfaces/interfaces.sln index 494c3199..5c877eb6 100644 --- a/interfaces/interfaces.sln +++ b/interfaces/interfaces.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 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interfaces", "interfaces.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/interfaces/interfaces.vcxproj b/interfaces/interfaces.vcxproj index b17abd03..64f6d0de 100644 --- a/interfaces/interfaces.vcxproj +++ b/interfaces/interfaces.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + interfaces @@ -20,30 +28,56 @@ StaticLibrary v120 + + StaticLibrary + v120 + StaticLibrary v120 + + StaticLibrary + v120 + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\lib\public\ ..\lib\public\ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + + + + ..\lib\public\win64 + + + ..\lib\public\win64 @@ -82,6 +116,42 @@ + + + + + + + Disabled + ..\public;..\public\tier0;..\public\tier1;..\public\interfaces;%(AdditionalIncludeDirectories) + _HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;_ITERATOR_DEBUG_LEVEL=0;WIN32;_WIN32;COMPILER_MSVC;COMPILER_MSVC32;_DEBUG;DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + true + + + EnableFastChecks + MultiThreadedDebug + false + Fast + + + + + + + Level3 + + + + + + + Rpcrt4.lib;%(AdditionalDependencies) + + + true + + + @@ -121,6 +191,45 @@ + + + + + + + ..\public;..\public\tier0;..\public\tier1;..\public\interfaces;%(AdditionalIncludeDirectories) + _HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;COMPILER_MSVC;COMPILER_MSVC64;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + true + + + MultiThreaded + false + true + + + + + + + Level3 + Fast + AnySuitable + true + Speed + + + + + + + + + + + true + + + diff --git a/lib/public/win64/interfaces.lib b/lib/public/win64/interfaces.lib new file mode 100644 index 00000000..00e157a1 Binary files /dev/null and b/lib/public/win64/interfaces.lib differ diff --git a/lib/public/win64/tier0.lib b/lib/public/win64/tier0.lib new file mode 100644 index 00000000..932580ff 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..20fc4de8 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..1963e367 Binary files /dev/null and b/lib/public/win64/vstdlib.lib differ diff --git a/tier1/interface.cpp b/tier1/interface.cpp index dbad03a6..062504c5 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/processor_detect.cpp b/tier1/processor_detect.cpp index a6bfe91b..be81312d 100644 --- a/tier1/processor_detect.cpp +++ b/tier1/processor_detect.cpp @@ -17,7 +17,7 @@ bool CheckSSETechnology(void) { return false; } bool CheckSSE2Technology(void) { return false; } bool Check3DNowTechnology(void) { return false; } -#elif defined( _WIN32 ) && !defined( _X360 ) +#elif defined( _WIN32 ) && !defined( _X360 ) && !defined( COMPILER_MSVC64 ) #pragma optimize( "", off ) #pragma warning( disable: 4800 ) //'int' : forcing value to bool 'true' or 'false' (performance warning) diff --git a/tier1/tier1.sln b/tier1/tier1.sln index 0cf1abae..bcc127ca 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 2013 +VisualStudioVersion = 12.0.31101.0 +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 5730765f..13882b8b 100644 --- a/tier1/tier1.vcxproj +++ b/tier1/tier1.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + tier1 @@ -20,36 +28,68 @@ StaticLibrary v120 + + StaticLibrary + v120 + StaticLibrary v120 + + StaticLibrary + v120 + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\lib\public\ true + true true + true true + true ..\lib\public\ true + true true + true true + true AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + + + + ..\lib\public\win64\ + + + ..\lib\public\win64\ @@ -105,6 +145,59 @@ $(OutDir)tier1.bsc + + + + + + + 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_MSVC32;_DEBUG;DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;TIER1_STATIC_LIB;%(PreprocessorDefinitions) + true + + + EnableFastChecks + MultiThreadedDebug + false + Fast + true + true + true + false + + + false + + + $(IntDir) + $(IntDir) + $(IntDir) + false + + + $(IntDir) + CompileAsCpp + Prompt + Level3 + + + + + + + false + Rpcrt4.lib;%(AdditionalDependencies) + true + + + true + + + true + $(OutDir)tier1.bsc + + @@ -164,6 +257,65 @@ $(OutDir)tier1.bsc + + + + + + + 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;WIN64;_WIN64;COMPILER_MSVC;COMPILER_MSVC64;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;TIER1_STATIC_LIB;%(PreprocessorDefinitions) + true + + + MultiThreaded + false + true + Fast + true + true + true + false + + + false + + + $(IntDir) + $(IntDir) + $(IntDir) + false + + + $(IntDir) + CompileAsCpp + Prompt + Level3 + + + /Zo %(AdditionalOptions) + + + + + + + false + Rpcrt4.lib;%(AdditionalDependencies) + true + + + true + + + true + $(OutDir)tier1.bsc + + @@ -183,7 +335,9 @@ Sync + Sync Sync + Sync