From e02edb50ea1e11d769e55d7b6156a45b24966af4 Mon Sep 17 00:00:00 2001 From: Remi Arnaud Date: Mon, 14 Aug 2017 16:22:24 -0700 Subject: [PATCH 01/10] added max 2018 proj and sln --- .../scripts/COLLADABaseUtils.vcxproj | 318 +++++++++++ .../scripts/COLLADAFramework.vcxproj | 304 ++++++++++ COLLADAMax/COLLADAMax.sln | 190 +++++++ COLLADAMax/scripts/COLLADAMax.vcxproj | 533 ++++++++++++++++++ .../scripts/COLLADASaxFrameworkLoader.vcxproj | 316 +++++++++++ .../scripts/COLLADAStreamWriter.vcxproj | 284 ++++++++++ Externals/LibXML/scripts/LibXML.vcxproj | 290 ++++++++++ .../MathMLSolver/scripts/MathMLSolver.vcxproj | 342 +++++++++++ Externals/pcre/scripts/pcre.vcxproj | 346 ++++++++++++ Externals/zlib/scripts/zlib.vcxproj | 408 ++++++++++++++ Externals/zziplib/scripts/zzip.vcxproj | 312 ++++++++++ .../scripts/G3DWarehouseBrowser.vcxproj | 272 +++++++++ .../scripts/GeneratedSaxParser.vcxproj | 294 ++++++++++ common/libBuffer/scripts/libBuffer.vcxproj | 300 ++++++++++ common/libftoa/scripts/libftoa.vcxproj | 332 +++++++++++ 15 files changed, 4841 insertions(+) diff --git a/COLLADABaseUtils/scripts/COLLADABaseUtils.vcxproj b/COLLADABaseUtils/scripts/COLLADABaseUtils.vcxproj index e83bcbf41..0c49a5470 100644 --- a/COLLADABaseUtils/scripts/COLLADABaseUtils.vcxproj +++ b/COLLADABaseUtils/scripts/COLLADABaseUtils.vcxproj @@ -1,6 +1,22 @@  + + Debug_Max2018_static + Win32 + + + Debug_Max2018_static + x64 + + + Debug_Max2018 + Win32 + + + Debug_Max2018 + x64 + Debug_static_v100 Win32 @@ -65,6 +81,22 @@ Debug_v90 x64 + + Release_Max2018_static + Win32 + + + Release_Max2018_static + x64 + + + Release_Max2018 + Win32 + + + Release_Max2018 + x64 + Release_static_v100 Win32 @@ -155,6 +187,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v90 @@ -173,6 +210,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v100 @@ -203,6 +246,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v100 @@ -218,6 +267,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v90 @@ -243,6 +297,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + StaticLibrary v90 @@ -261,6 +320,12 @@ Unicode true + + StaticLibrary + v140 + Unicode + true + StaticLibrary v100 @@ -291,6 +356,12 @@ Unicode true + + StaticLibrary + v140 + Unicode + true + StaticLibrary v100 @@ -306,6 +377,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + StaticLibrary v90 @@ -326,6 +402,9 @@ + + + @@ -335,6 +414,9 @@ + + + @@ -350,6 +432,9 @@ + + + @@ -359,6 +444,9 @@ + + + @@ -374,6 +462,9 @@ + + + @@ -383,6 +474,9 @@ + + + @@ -398,6 +492,9 @@ + + + @@ -407,6 +504,9 @@ + + + @@ -426,6 +526,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -442,6 +546,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -462,6 +570,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -478,6 +590,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -490,6 +606,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -506,6 +626,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -526,6 +650,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -542,6 +670,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + Disabled @@ -596,6 +728,24 @@ $(OutDir)$(ProjectName).lib + + + Disabled + ..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + Use + COLLADABUStableHeaders.h + Level3 + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + Disabled @@ -677,6 +827,27 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + Disabled + ..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + Use + COLLADABUStableHeaders.h + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + X64 @@ -770,6 +941,24 @@ $(OutDir)$(ProjectName).lib + + + MaxSpeed + true + ..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreadedDLL + false + Use + COLLADABUStableHeaders.h + Level3 + + + + + $(OutDir)$(ProjectName).lib + + X64 @@ -850,6 +1039,26 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + MaxSpeed + true + ..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreadedDLL + false + Use + COLLADABUStableHeaders.h + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -904,6 +1113,24 @@ $(OutDir)$(ProjectName).lib + + + MaxSpeed + true + ..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreaded + false + Use + COLLADABUStableHeaders.h + Level3 + + + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -982,6 +1209,26 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + MaxSpeed + true + ..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreaded + false + Use + COLLADABUStableHeaders.h + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1074,6 +1321,24 @@ $(OutDir)$(ProjectName).lib + + + Disabled + ..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + Use + COLLADABUStableHeaders.h + Level3 + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1158,6 +1423,27 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + Disabled + ..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + Use + COLLADABUStableHeaders.h + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + @@ -1168,6 +1454,8 @@ + + @@ -1176,6 +1464,8 @@ + + @@ -1184,12 +1474,16 @@ + + + + @@ -1198,6 +1492,8 @@ + + @@ -1206,6 +1502,8 @@ + + @@ -1214,6 +1512,8 @@ + + @@ -1222,6 +1522,8 @@ + + @@ -1230,6 +1532,8 @@ + + @@ -1240,6 +1544,8 @@ + + @@ -1248,6 +1554,8 @@ + + @@ -1256,6 +1564,8 @@ + + @@ -1266,34 +1576,42 @@ Create Create Create + Create Create Create Create Create + Create Create Create Create + Create Create Create Create Create + Create Create Create Create Create + Create Create Create Create Create + Create Create Create Create Create Create + Create Create Create Create Create + Create diff --git a/COLLADAFramework/scripts/COLLADAFramework.vcxproj b/COLLADAFramework/scripts/COLLADAFramework.vcxproj index cf17b5497..c5c6e0abf 100644 --- a/COLLADAFramework/scripts/COLLADAFramework.vcxproj +++ b/COLLADAFramework/scripts/COLLADAFramework.vcxproj @@ -1,6 +1,22 @@  + + Debug_Max2018_static + Win32 + + + Debug_Max2018_static + x64 + + + Debug_Max2018 + Win32 + + + Debug_Max2018 + x64 + Debug_static_v100 Win32 @@ -65,6 +81,22 @@ Debug_v90 x64 + + Release_Max2018_static + Win32 + + + Release_Max2018_static + x64 + + + Release_Max2018 + Win32 + + + Release_Max2018 + x64 + Release_static_v100 Win32 @@ -156,6 +188,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v90 @@ -174,6 +211,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v100 @@ -198,6 +241,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v110 @@ -224,6 +273,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v90 @@ -244,6 +298,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + StaticLibrary v90 @@ -262,6 +321,12 @@ Unicode true + + StaticLibrary + v140 + Unicode + true + StaticLibrary v100 @@ -286,6 +351,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v140 @@ -312,6 +383,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + @@ -327,6 +403,9 @@ + + + @@ -336,6 +415,9 @@ + + + @@ -348,6 +430,9 @@ + + + @@ -363,6 +448,9 @@ + + + @@ -375,6 +463,9 @@ + + + @@ -384,6 +475,9 @@ + + + @@ -396,6 +490,9 @@ + + + @@ -411,6 +508,9 @@ + + + <_ProjectFileVersion>12.0.30501.0 @@ -431,6 +531,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -447,6 +551,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -459,6 +567,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -475,6 +587,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -491,6 +607,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -507,6 +627,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -527,6 +651,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -543,6 +671,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + Disabled @@ -619,6 +751,25 @@ $(OutDir)$(ProjectName).lib + + + Disabled + ..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + false + Use + COLLADAFWStableHeaders.h + Level2 + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + X64 @@ -707,6 +858,28 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + Disabled + ..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + false + Use + COLLADAFWStableHeaders.h + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -764,6 +937,25 @@ $(OutDir)$(ProjectName).lib + + + MaxSpeed + true + ..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + false + Use + COLLADAFWStableHeaders.h + Level3 + + + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -849,6 +1041,28 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + MaxSpeed + true + ..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + false + Use + COLLADAFWStableHeaders.h + Level3 + + + + + $(OutDir)$(ProjectName).lib + + X64 @@ -928,6 +1142,25 @@ $(OutDir)$(ProjectName).lib + + + MaxSpeed + true + ..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreaded + true + false + Use + COLLADAFWStableHeaders.h + Level3 + + + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -1013,6 +1246,28 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + MaxSpeed + true + ..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreaded + true + false + Use + COLLADAFWStableHeaders.h + Level3 + + + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1111,6 +1366,25 @@ $(OutDir)$(ProjectName).lib + + + Disabled + ..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + false + Use + COLLADAFWStableHeaders.h + Level2 + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1199,6 +1473,28 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + Disabled + ..\include;..\..\COLLADABaseUtils\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + false + Use + COLLADAFWStableHeaders.h + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + @@ -1229,33 +1525,41 @@ Create Create Create + Create Create Create Create Create + Create Create Create Create Create + Create Create Create Create Create + Create Create Create Create + Create Create Create Create Create + Create Create Create Create Create + Create Create Create Create Create + Create Create diff --git a/COLLADAMax/COLLADAMax.sln b/COLLADAMax/COLLADAMax.sln index 39aeae108..53dcfa06f 100644 --- a/COLLADAMax/COLLADAMax.sln +++ b/COLLADAMax/COLLADAMax.sln @@ -65,6 +65,10 @@ Global Debug_Max2017_static|x64 = Debug_Max2017_static|x64 Debug_Max2017|Win32 = Debug_Max2017|Win32 Debug_Max2017|x64 = Debug_Max2017|x64 + Debug_Max2018_static|Win32 = Debug_Max2018_static|Win32 + Debug_Max2018_static|x64 = Debug_Max2018_static|x64 + Debug_Max2018|Win32 = Debug_Max2018|Win32 + Debug_Max2018|x64 = Debug_Max2018|x64 Release_Max2011_static|Win32 = Release_Max2011_static|Win32 Release_Max2011_static|x64 = Release_Max2011_static|x64 Release_Max2011|Win32 = Release_Max2011|Win32 @@ -97,6 +101,10 @@ Global Release_Max2017_static|x64 = Release_Max2017_static|x64 Release_Max2017|Win32 = Release_Max2017|Win32 Release_Max2017|x64 = Release_Max2017|x64 + Release_Max2018_static|Win32 = Release_Max2018_static|Win32 + Release_Max2018_static|x64 = Release_Max2018_static|x64 + Release_Max2018|Win32 = Release_Max2018|Win32 + Release_Max2018|x64 = Release_Max2018|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Debug_Max2011_static|Win32.ActiveCfg = Debug_Max2011_static|Win32 @@ -153,6 +161,12 @@ Global {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Debug_Max2017|Win32.ActiveCfg = Debug_Max2015|Win32 {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Debug_Max2017|x64.ActiveCfg = Debug_Max2017|x64 {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Debug_Max2017|x64.Build.0 = Debug_Max2017|x64 + {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Debug_Max2018_static|Win32.ActiveCfg = Debug_Max2018_static|Win32 + {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Debug_Max2018_static|x64.ActiveCfg = Debug_Max2018_static|x64 + {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Debug_Max2018_static|x64.Build.0 = Debug_Max2018_static|x64 + {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Debug_Max2018|Win32.ActiveCfg = Debug_Max2018|Win32 + {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Debug_Max2018|x64.ActiveCfg = Debug_Max2018|x64 + {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Debug_Max2018|x64.Build.0 = Debug_Max2018|x64 {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Release_Max2011_static|Win32.ActiveCfg = Release_Max2011_static|Win32 {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Release_Max2011_static|Win32.Build.0 = Release_Max2011_static|Win32 {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Release_Max2011_static|x64.ActiveCfg = Release_Max2011_static|x64 @@ -207,6 +221,13 @@ Global {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Release_Max2017|Win32.ActiveCfg = Release_Max2017|Win32 {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Release_Max2017|x64.ActiveCfg = Release_Max2017|x64 {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Release_Max2017|x64.Build.0 = Release_Max2017|x64 + {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Release_Max2018_static|Win32.ActiveCfg = Release_Max2018_static|Win32 + {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Release_Max2018_static|Win32.Build.0 = Release_Max2018_static|Win32 + {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Release_Max2018_static|x64.ActiveCfg = Release_Max2018_static|x64 + {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Release_Max2018_static|x64.Build.0 = Release_Max2018_static|x64 + {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 + {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Release_Max2018|x64.ActiveCfg = Release_Max2018|x64 + {8840B0EA-A0B3-45D6-855D-8382B247CE8B}.Release_Max2018|x64.Build.0 = Release_Max2018|x64 {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Debug_Max2011_static|Win32.ActiveCfg = Debug_static_v90|Win32 {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Debug_Max2011_static|Win32.Build.0 = Debug_static_v90|Win32 {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Debug_Max2011_static|x64.ActiveCfg = Debug_static_v90|x64 @@ -261,6 +282,12 @@ Global {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Debug_Max2017|Win32.ActiveCfg = Debug_v110|Win32 {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Debug_Max2017|x64.ActiveCfg = Debug_v140|x64 {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Debug_Max2017|x64.Build.0 = Debug_v140|x64 + {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Debug_Max2018_static|Win32.ActiveCfg = Debug_Max2018_static|Win32 + {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Debug_Max2018_static|x64.ActiveCfg = Debug_static_v140|x64 + {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Debug_Max2018_static|x64.Build.0 = Debug_static_v140|x64 + {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Debug_Max2018|Win32.ActiveCfg = Debug_Max2018|Win32 + {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Debug_Max2018|x64.ActiveCfg = Debug_v140|x64 + {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Debug_Max2018|x64.Build.0 = Debug_v140|x64 {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Release_Max2011_static|Win32.ActiveCfg = Release_static_v90|Win32 {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Release_Max2011_static|Win32.Build.0 = Release_static_v90|Win32 {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Release_Max2011_static|x64.ActiveCfg = Release_static_v90|x64 @@ -315,6 +342,13 @@ Global {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Release_Max2017|Win32.ActiveCfg = Release_v110|Win32 {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Release_Max2017|x64.ActiveCfg = Release_v140|x64 {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Release_Max2017|x64.Build.0 = Release_v140|x64 + {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Release_Max2018_static|Win32.ActiveCfg = Release_Max2018_static|Win32 + {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Release_Max2018_static|Win32.Build.0 = Release_Max2018_static|Win32 + {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Release_Max2018_static|x64.ActiveCfg = Release_static_v140|x64 + {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Release_Max2018_static|x64.Build.0 = Release_static_v140|x64 + {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 + {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Release_Max2018|x64.ActiveCfg = Release_v140|x64 + {EAB66F01-60B5-43C9-B78D-A8B0B545A20B}.Release_Max2018|x64.Build.0 = Release_v140|x64 {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Debug_Max2011_static|Win32.ActiveCfg = Debug_static_v90|Win32 {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Debug_Max2011_static|Win32.Build.0 = Debug_static_v90|Win32 {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Debug_Max2011_static|x64.ActiveCfg = Debug_static_v90|x64 @@ -371,6 +405,12 @@ Global {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Debug_Max2017|Win32.ActiveCfg = Debug_v110|Win32 {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Debug_Max2017|x64.ActiveCfg = Debug_v140|x64 {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Debug_Max2017|x64.Build.0 = Debug_v140|x64 + {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Debug_Max2018_static|Win32.ActiveCfg = Debug_Max2018_static|Win32 + {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Debug_Max2018_static|x64.ActiveCfg = Debug_static_v140|x64 + {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Debug_Max2018_static|x64.Build.0 = Debug_static_v140|x64 + {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Debug_Max2018|Win32.ActiveCfg = Debug_Max2018|Win32 + {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Debug_Max2018|x64.ActiveCfg = Debug_v140|x64 + {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Debug_Max2018|x64.Build.0 = Debug_v140|x64 {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Release_Max2011_static|Win32.ActiveCfg = Release_static_v90|Win32 {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Release_Max2011_static|Win32.Build.0 = Release_static_v90|Win32 {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Release_Max2011_static|x64.ActiveCfg = Release_static_v90|x64 @@ -425,6 +465,13 @@ Global {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Release_Max2017|Win32.ActiveCfg = Release_v110|Win32 {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Release_Max2017|x64.ActiveCfg = Release_v140|x64 {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Release_Max2017|x64.Build.0 = Release_v140|x64 + {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Release_Max2018_static|Win32.ActiveCfg = Release_Max2018_static|Win32 + {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Release_Max2018_static|Win32.Build.0 = Release_Max2018_static|Win32 + {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Release_Max2018_static|x64.ActiveCfg = Release_static_v140|x64 + {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Release_Max2018_static|x64.Build.0 = Release_static_v140|x64 + {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 + {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Release_Max2018|x64.ActiveCfg = Release_v140|x64 + {9F164B41-40E0-4EFA-A7C7-A89C12B4FB39}.Release_Max2018|x64.Build.0 = Release_v140|x64 {2C3C4869-D684-4981-98E7-6D9798B72145}.Debug_Max2011_static|Win32.ActiveCfg = Debug_static_v90|Win32 {2C3C4869-D684-4981-98E7-6D9798B72145}.Debug_Max2011_static|Win32.Build.0 = Debug_static_v90|Win32 {2C3C4869-D684-4981-98E7-6D9798B72145}.Debug_Max2011_static|x64.ActiveCfg = Debug_static_v90|x64 @@ -481,6 +528,12 @@ Global {2C3C4869-D684-4981-98E7-6D9798B72145}.Debug_Max2017|Win32.ActiveCfg = Debug_v110|Win32 {2C3C4869-D684-4981-98E7-6D9798B72145}.Debug_Max2017|x64.ActiveCfg = Debug_v140|x64 {2C3C4869-D684-4981-98E7-6D9798B72145}.Debug_Max2017|x64.Build.0 = Debug_v140|x64 + {2C3C4869-D684-4981-98E7-6D9798B72145}.Debug_Max2018_static|Win32.ActiveCfg = Debug_Max2018_static|Win32 + {2C3C4869-D684-4981-98E7-6D9798B72145}.Debug_Max2018_static|x64.ActiveCfg = Debug_static_v140|x64 + {2C3C4869-D684-4981-98E7-6D9798B72145}.Debug_Max2018_static|x64.Build.0 = Debug_static_v140|x64 + {2C3C4869-D684-4981-98E7-6D9798B72145}.Debug_Max2018|Win32.ActiveCfg = Debug_Max2018|Win32 + {2C3C4869-D684-4981-98E7-6D9798B72145}.Debug_Max2018|x64.ActiveCfg = Debug_v140|x64 + {2C3C4869-D684-4981-98E7-6D9798B72145}.Debug_Max2018|x64.Build.0 = Debug_v140|x64 {2C3C4869-D684-4981-98E7-6D9798B72145}.Release_Max2011_static|Win32.ActiveCfg = Release_static_v90|Win32 {2C3C4869-D684-4981-98E7-6D9798B72145}.Release_Max2011_static|Win32.Build.0 = Release_static_v90|Win32 {2C3C4869-D684-4981-98E7-6D9798B72145}.Release_Max2011_static|x64.ActiveCfg = Release_static_v90|x64 @@ -535,6 +588,13 @@ Global {2C3C4869-D684-4981-98E7-6D9798B72145}.Release_Max2017|Win32.ActiveCfg = Release_v140|Win32 {2C3C4869-D684-4981-98E7-6D9798B72145}.Release_Max2017|x64.ActiveCfg = Release_v140|x64 {2C3C4869-D684-4981-98E7-6D9798B72145}.Release_Max2017|x64.Build.0 = Release_v140|x64 + {2C3C4869-D684-4981-98E7-6D9798B72145}.Release_Max2018_static|Win32.ActiveCfg = Release_Max2018_static|Win32 + {2C3C4869-D684-4981-98E7-6D9798B72145}.Release_Max2018_static|Win32.Build.0 = Release_Max2018_static|Win32 + {2C3C4869-D684-4981-98E7-6D9798B72145}.Release_Max2018_static|x64.ActiveCfg = Release_static_v140|x64 + {2C3C4869-D684-4981-98E7-6D9798B72145}.Release_Max2018_static|x64.Build.0 = Release_static_v140|x64 + {2C3C4869-D684-4981-98E7-6D9798B72145}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 + {2C3C4869-D684-4981-98E7-6D9798B72145}.Release_Max2018|x64.ActiveCfg = Release_v140|x64 + {2C3C4869-D684-4981-98E7-6D9798B72145}.Release_Max2018|x64.Build.0 = Release_v140|x64 {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Debug_Max2011_static|Win32.ActiveCfg = Debug_LibXML_NoValidation_static_v90|Win32 {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Debug_Max2011_static|Win32.Build.0 = Debug_LibXML_NoValidation_static_v90|Win32 {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Debug_Max2011_static|x64.ActiveCfg = Debug_LibXML_NoValidation_static_v90|x64 @@ -589,6 +649,12 @@ Global {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Debug_Max2017|Win32.ActiveCfg = Debug_LibXML_NoValidation_v110|Win32 {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Debug_Max2017|x64.ActiveCfg = Debug_LibXML_NoValidation_v140|x64 {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Debug_Max2017|x64.Build.0 = Debug_LibXML_NoValidation_v140|x64 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Debug_Max2018_static|Win32.ActiveCfg = Debug_Max2018_static|Win32 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Debug_Max2018_static|x64.ActiveCfg = Debug_LibXML_NoValidation_static_v140|x64 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Debug_Max2018_static|x64.Build.0 = Debug_LibXML_NoValidation_static_v140|x64 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Debug_Max2018|Win32.ActiveCfg = Debug_Max2018|Win32 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Debug_Max2018|x64.ActiveCfg = Debug_LibXML_NoValidation_v140|x64 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Debug_Max2018|x64.Build.0 = Debug_LibXML_NoValidation_v140|x64 {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2011_static|Win32.ActiveCfg = Release_LibXML_NoValidation_static_v90|Win32 {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2011_static|Win32.Build.0 = Release_LibXML_NoValidation_static_v90|Win32 {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2011_static|x64.ActiveCfg = Release_LibXML_NoValidation_static_v90|x64 @@ -643,6 +709,13 @@ Global {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2017|Win32.ActiveCfg = Release_LibXML_v110|Win32 {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2017|x64.ActiveCfg = Release_LibXML_v140|x64 {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2017|x64.Build.0 = Release_LibXML_v140|x64 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018_static|Win32.ActiveCfg = Release_Max2018_static|Win32 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018_static|Win32.Build.0 = Release_Max2018_static|Win32 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018_static|x64.ActiveCfg = Debug_LibXML_NoValidation_static_v140|x64 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018_static|x64.Build.0 = Debug_LibXML_NoValidation_static_v140|x64 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018|x64.ActiveCfg = Release_LibXML_v140|x64 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018|x64.Build.0 = Release_LibXML_v140|x64 {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Debug_Max2011_static|Win32.ActiveCfg = Debug_LibXML_static_v90|Win32 {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Debug_Max2011_static|Win32.Build.0 = Debug_LibXML_static_v90|Win32 {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Debug_Max2011_static|x64.ActiveCfg = Debug_LibXML_static_v90|x64 @@ -697,6 +770,12 @@ Global {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Debug_Max2017|Win32.ActiveCfg = Debug_LibXML_v110|Win32 {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Debug_Max2017|x64.ActiveCfg = Debug_LibXML_v140|x64 {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Debug_Max2017|x64.Build.0 = Debug_LibXML_v140|x64 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Debug_Max2018_static|Win32.ActiveCfg = Debug_Max2018_static|Win32 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Debug_Max2018_static|x64.ActiveCfg = Debug_LibXML_static_v140|x64 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Debug_Max2018_static|x64.Build.0 = Debug_LibXML_static_v140|x64 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Debug_Max2018|Win32.ActiveCfg = Debug_Max2018|Win32 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Debug_Max2018|x64.ActiveCfg = Debug_LibXML_v140|x64 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Debug_Max2018|x64.Build.0 = Debug_LibXML_v140|x64 {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2011_static|Win32.ActiveCfg = Release_LibXML_static_v90|Win32 {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2011_static|Win32.Build.0 = Release_LibXML_static_v90|Win32 {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2011_static|x64.ActiveCfg = Release_LibXML_static_v90|x64 @@ -751,6 +830,13 @@ Global {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2017|Win32.ActiveCfg = Release_LibXML_v110|Win32 {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2017|x64.ActiveCfg = Release_LibXML_v140|x64 {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2017|x64.Build.0 = Release_LibXML_v140|x64 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2018_static|Win32.ActiveCfg = Release_Max2018_static|Win32 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2018_static|Win32.Build.0 = Release_Max2018_static|Win32 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2018_static|x64.ActiveCfg = Release_LibXML_static_v140|x64 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2018_static|x64.Build.0 = Release_LibXML_static_v140|x64 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2018|x64.ActiveCfg = Debug_LibXML_v140|x64 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2018|x64.Build.0 = Debug_LibXML_v140|x64 {D7F466F4-2AEA-4648-BE09-024C887BC157}.Debug_Max2011_static|Win32.ActiveCfg = Debug_static_v90|Win32 {D7F466F4-2AEA-4648-BE09-024C887BC157}.Debug_Max2011_static|Win32.Build.0 = Debug_static_v90|Win32 {D7F466F4-2AEA-4648-BE09-024C887BC157}.Debug_Max2011_static|x64.ActiveCfg = Debug_static_v90|x64 @@ -805,6 +891,12 @@ Global {D7F466F4-2AEA-4648-BE09-024C887BC157}.Debug_Max2017|Win32.ActiveCfg = Debug_v110|Win32 {D7F466F4-2AEA-4648-BE09-024C887BC157}.Debug_Max2017|x64.ActiveCfg = Debug_v140|x64 {D7F466F4-2AEA-4648-BE09-024C887BC157}.Debug_Max2017|x64.Build.0 = Debug_v140|x64 + {D7F466F4-2AEA-4648-BE09-024C887BC157}.Debug_Max2018_static|Win32.ActiveCfg = Debug_Max2018_static|Win32 + {D7F466F4-2AEA-4648-BE09-024C887BC157}.Debug_Max2018_static|x64.ActiveCfg = Debug_static_v140|x64 + {D7F466F4-2AEA-4648-BE09-024C887BC157}.Debug_Max2018_static|x64.Build.0 = Debug_static_v140|x64 + {D7F466F4-2AEA-4648-BE09-024C887BC157}.Debug_Max2018|Win32.ActiveCfg = Debug_Max2018|Win32 + {D7F466F4-2AEA-4648-BE09-024C887BC157}.Debug_Max2018|x64.ActiveCfg = Debug_v140|x64 + {D7F466F4-2AEA-4648-BE09-024C887BC157}.Debug_Max2018|x64.Build.0 = Debug_v140|x64 {D7F466F4-2AEA-4648-BE09-024C887BC157}.Release_Max2011_static|Win32.ActiveCfg = Release_static_v90|Win32 {D7F466F4-2AEA-4648-BE09-024C887BC157}.Release_Max2011_static|Win32.Build.0 = Release_static_v90|Win32 {D7F466F4-2AEA-4648-BE09-024C887BC157}.Release_Max2011_static|x64.ActiveCfg = Release_static_v90|x64 @@ -859,6 +951,13 @@ Global {D7F466F4-2AEA-4648-BE09-024C887BC157}.Release_Max2017|Win32.ActiveCfg = Release_v110|Win32 {D7F466F4-2AEA-4648-BE09-024C887BC157}.Release_Max2017|x64.ActiveCfg = Release_v140|x64 {D7F466F4-2AEA-4648-BE09-024C887BC157}.Release_Max2017|x64.Build.0 = Release_v140|x64 + {D7F466F4-2AEA-4648-BE09-024C887BC157}.Release_Max2018_static|Win32.ActiveCfg = Release_Max2018_static|Win32 + {D7F466F4-2AEA-4648-BE09-024C887BC157}.Release_Max2018_static|Win32.Build.0 = Release_Max2018_static|Win32 + {D7F466F4-2AEA-4648-BE09-024C887BC157}.Release_Max2018_static|x64.ActiveCfg = Release_static_v140|x64 + {D7F466F4-2AEA-4648-BE09-024C887BC157}.Release_Max2018_static|x64.Build.0 = Release_static_v140|x64 + {D7F466F4-2AEA-4648-BE09-024C887BC157}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 + {D7F466F4-2AEA-4648-BE09-024C887BC157}.Release_Max2018|x64.ActiveCfg = Release_v140|x64 + {D7F466F4-2AEA-4648-BE09-024C887BC157}.Release_Max2018|x64.Build.0 = Release_v140|x64 {71A48A24-8603-49FB-9458-CB4E97309378}.Debug_Max2011_static|Win32.ActiveCfg = Debug_static_v90|Win32 {71A48A24-8603-49FB-9458-CB4E97309378}.Debug_Max2011_static|Win32.Build.0 = Debug_static_v90|Win32 {71A48A24-8603-49FB-9458-CB4E97309378}.Debug_Max2011_static|x64.ActiveCfg = Debug_static_v90|x64 @@ -913,6 +1012,12 @@ Global {71A48A24-8603-49FB-9458-CB4E97309378}.Debug_Max2017|Win32.ActiveCfg = Debug_v110|Win32 {71A48A24-8603-49FB-9458-CB4E97309378}.Debug_Max2017|x64.ActiveCfg = Debug_v140|x64 {71A48A24-8603-49FB-9458-CB4E97309378}.Debug_Max2017|x64.Build.0 = Debug_v140|x64 + {71A48A24-8603-49FB-9458-CB4E97309378}.Debug_Max2018_static|Win32.ActiveCfg = Debug_Max2018_static|Win32 + {71A48A24-8603-49FB-9458-CB4E97309378}.Debug_Max2018_static|x64.ActiveCfg = Release_static_v140|x64 + {71A48A24-8603-49FB-9458-CB4E97309378}.Debug_Max2018_static|x64.Build.0 = Release_static_v140|x64 + {71A48A24-8603-49FB-9458-CB4E97309378}.Debug_Max2018|Win32.ActiveCfg = Debug_Max2018|Win32 + {71A48A24-8603-49FB-9458-CB4E97309378}.Debug_Max2018|x64.ActiveCfg = Debug_v140|x64 + {71A48A24-8603-49FB-9458-CB4E97309378}.Debug_Max2018|x64.Build.0 = Debug_v140|x64 {71A48A24-8603-49FB-9458-CB4E97309378}.Release_Max2011_static|Win32.ActiveCfg = Release_static_v90|Win32 {71A48A24-8603-49FB-9458-CB4E97309378}.Release_Max2011_static|Win32.Build.0 = Release_static_v90|Win32 {71A48A24-8603-49FB-9458-CB4E97309378}.Release_Max2011_static|x64.ActiveCfg = Release_static_v90|x64 @@ -967,6 +1072,13 @@ Global {71A48A24-8603-49FB-9458-CB4E97309378}.Release_Max2017|Win32.ActiveCfg = Release_v110|Win32 {71A48A24-8603-49FB-9458-CB4E97309378}.Release_Max2017|x64.ActiveCfg = Release_v140|x64 {71A48A24-8603-49FB-9458-CB4E97309378}.Release_Max2017|x64.Build.0 = Release_v140|x64 + {71A48A24-8603-49FB-9458-CB4E97309378}.Release_Max2018_static|Win32.ActiveCfg = Release_Max2018_static|Win32 + {71A48A24-8603-49FB-9458-CB4E97309378}.Release_Max2018_static|Win32.Build.0 = Release_Max2018_static|Win32 + {71A48A24-8603-49FB-9458-CB4E97309378}.Release_Max2018_static|x64.ActiveCfg = Release_static_v140|x64 + {71A48A24-8603-49FB-9458-CB4E97309378}.Release_Max2018_static|x64.Build.0 = Release_static_v140|x64 + {71A48A24-8603-49FB-9458-CB4E97309378}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 + {71A48A24-8603-49FB-9458-CB4E97309378}.Release_Max2018|x64.ActiveCfg = Release_v140|x64 + {71A48A24-8603-49FB-9458-CB4E97309378}.Release_Max2018|x64.Build.0 = Release_v140|x64 {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Debug_Max2011_static|Win32.ActiveCfg = Debug_static_v90|Win32 {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Debug_Max2011_static|Win32.Build.0 = Debug_static_v90|Win32 {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Debug_Max2011_static|x64.ActiveCfg = Debug_static_v90|x64 @@ -1021,6 +1133,12 @@ Global {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Debug_Max2017|Win32.ActiveCfg = Debug_v110|Win32 {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Debug_Max2017|x64.ActiveCfg = Debug_v140|x64 {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Debug_Max2017|x64.Build.0 = Debug_v140|x64 + {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Debug_Max2018_static|Win32.ActiveCfg = Debug_Max2018_static|Win32 + {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Debug_Max2018_static|x64.ActiveCfg = Debug_static_v140|x64 + {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Debug_Max2018_static|x64.Build.0 = Debug_static_v140|x64 + {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Debug_Max2018|Win32.ActiveCfg = Debug_Max2018|Win32 + {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Debug_Max2018|x64.ActiveCfg = Debug_v140|x64 + {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Debug_Max2018|x64.Build.0 = Debug_v140|x64 {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Release_Max2011_static|Win32.ActiveCfg = Release_static_v90|Win32 {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Release_Max2011_static|Win32.Build.0 = Release_static_v90|Win32 {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Release_Max2011_static|x64.ActiveCfg = Release_static_v90|x64 @@ -1075,6 +1193,13 @@ Global {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Release_Max2017|Win32.ActiveCfg = Release_v110|Win32 {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Release_Max2017|x64.ActiveCfg = Release_v140|x64 {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Release_Max2017|x64.Build.0 = Release_v140|x64 + {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Release_Max2018_static|Win32.ActiveCfg = Release_Max2018_static|Win32 + {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Release_Max2018_static|Win32.Build.0 = Release_Max2018_static|Win32 + {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Release_Max2018_static|x64.ActiveCfg = Release_static_v140|x64 + {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Release_Max2018_static|x64.Build.0 = Release_static_v140|x64 + {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 + {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Release_Max2018|x64.ActiveCfg = Release_v140|x64 + {81F6BA2E-BB3A-4D67-AC12-A112946EB832}.Release_Max2018|x64.Build.0 = Release_v140|x64 {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Debug_Max2011_static|Win32.ActiveCfg = Debug_static_v90|Win32 {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Debug_Max2011_static|Win32.Build.0 = Debug_static_v90|Win32 {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Debug_Max2011_static|x64.ActiveCfg = Debug_static_v90|x64 @@ -1129,6 +1254,12 @@ Global {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Debug_Max2017|Win32.ActiveCfg = Debug_v110|Win32 {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Debug_Max2017|x64.ActiveCfg = Debug_v140|x64 {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Debug_Max2017|x64.Build.0 = Debug_v140|x64 + {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Debug_Max2018_static|Win32.ActiveCfg = Debug_Max2018_static|Win32 + {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Debug_Max2018_static|x64.ActiveCfg = Release_static_v140|x64 + {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Debug_Max2018_static|x64.Build.0 = Release_static_v140|x64 + {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Debug_Max2018|Win32.ActiveCfg = Debug_Max2018|Win32 + {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Debug_Max2018|x64.ActiveCfg = Debug_v140|x64 + {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Debug_Max2018|x64.Build.0 = Debug_v140|x64 {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Release_Max2011_static|Win32.ActiveCfg = Release_static_v90|Win32 {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Release_Max2011_static|Win32.Build.0 = Release_static_v90|Win32 {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Release_Max2011_static|x64.ActiveCfg = Release_static_v90|x64 @@ -1183,6 +1314,13 @@ Global {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Release_Max2017|Win32.ActiveCfg = Release_v110|Win32 {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Release_Max2017|x64.ActiveCfg = Release_v140|x64 {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Release_Max2017|x64.Build.0 = Release_v140|x64 + {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Release_Max2018_static|Win32.ActiveCfg = Release_Max2018_static|Win32 + {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Release_Max2018_static|Win32.Build.0 = Release_Max2018_static|Win32 + {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Release_Max2018_static|x64.ActiveCfg = Release_static_v140|x64 + {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Release_Max2018_static|x64.Build.0 = Release_static_v140|x64 + {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 + {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Release_Max2018|x64.ActiveCfg = Release_v140|x64 + {E0BA2017-9EC0-496C-BA5C-FB19C44A7AF0}.Release_Max2018|x64.Build.0 = Release_v140|x64 {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug_Max2011_static|Win32.ActiveCfg = Debug_static_v90|Win32 {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug_Max2011_static|Win32.Build.0 = Debug_static_v90|Win32 {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug_Max2011_static|x64.ActiveCfg = Debug_static_v90|x64 @@ -1237,6 +1375,12 @@ Global {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug_Max2017|Win32.ActiveCfg = Debug_v110|Win32 {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug_Max2017|x64.ActiveCfg = Debug_v140|x64 {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug_Max2017|x64.Build.0 = Debug_v140|x64 + {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug_Max2018_static|Win32.ActiveCfg = Debug_Max2018_static|Win32 + {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug_Max2018_static|x64.ActiveCfg = Debug_static_v140|x64 + {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug_Max2018_static|x64.Build.0 = Debug_static_v140|x64 + {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug_Max2018|Win32.ActiveCfg = Debug_Max2018|Win32 + {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug_Max2018|x64.ActiveCfg = Debug_v140|x64 + {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Debug_Max2018|x64.Build.0 = Debug_v140|x64 {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release_Max2011_static|Win32.ActiveCfg = Release_static_v90|Win32 {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release_Max2011_static|Win32.Build.0 = Release_static_v90|Win32 {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release_Max2011_static|x64.ActiveCfg = Release_static_v90|x64 @@ -1291,6 +1435,13 @@ Global {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release_Max2017|Win32.ActiveCfg = Release_v110|Win32 {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release_Max2017|x64.ActiveCfg = Release_v140|x64 {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release_Max2017|x64.Build.0 = Release_v140|x64 + {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release_Max2018_static|Win32.ActiveCfg = Release_Max2018_static|Win32 + {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release_Max2018_static|Win32.Build.0 = Release_Max2018_static|Win32 + {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release_Max2018_static|x64.ActiveCfg = Release_static_v140|x64 + {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release_Max2018_static|x64.Build.0 = Release_static_v140|x64 + {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 + {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release_Max2018|x64.ActiveCfg = Release_v140|x64 + {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD}.Release_Max2018|x64.Build.0 = Release_v140|x64 {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Debug_Max2011_static|Win32.ActiveCfg = Debug_static_v90|Win32 {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Debug_Max2011_static|Win32.Build.0 = Debug_static_v90|Win32 {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Debug_Max2011_static|x64.ActiveCfg = Debug_static_v90|x64 @@ -1345,6 +1496,12 @@ Global {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Debug_Max2017|Win32.ActiveCfg = Debug_v110|Win32 {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Debug_Max2017|x64.ActiveCfg = Debug_v140|x64 {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Debug_Max2017|x64.Build.0 = Debug_v140|x64 + {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Debug_Max2018_static|Win32.ActiveCfg = Debug_Max2018_static|Win32 + {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Debug_Max2018_static|x64.ActiveCfg = Debug_Max2018_static|x64 + {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Debug_Max2018_static|x64.Build.0 = Debug_Max2018_static|x64 + {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Debug_Max2018|Win32.ActiveCfg = Debug_Max2018|Win32 + {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Debug_Max2018|x64.ActiveCfg = Debug_v140|x64 + {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Debug_Max2018|x64.Build.0 = Debug_v140|x64 {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Release_Max2011_static|Win32.ActiveCfg = Release_static_v90|Win32 {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Release_Max2011_static|Win32.Build.0 = Release_static_v90|Win32 {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Release_Max2011_static|x64.ActiveCfg = Release_static_v90|x64 @@ -1399,6 +1556,13 @@ Global {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Release_Max2017|Win32.ActiveCfg = Release_v110|Win32 {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Release_Max2017|x64.ActiveCfg = Release_v140|x64 {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Release_Max2017|x64.Build.0 = Release_v140|x64 + {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Release_Max2018_static|Win32.ActiveCfg = Release_Max2018_static|Win32 + {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Release_Max2018_static|Win32.Build.0 = Release_Max2018_static|Win32 + {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Release_Max2018_static|x64.ActiveCfg = Release_static_v140|x64 + {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Release_Max2018_static|x64.Build.0 = Release_static_v140|x64 + {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 + {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Release_Max2018|x64.ActiveCfg = Release_v140|x64 + {F1DEFC38-6AA9-4799-983B-96610117CAF7}.Release_Max2018|x64.Build.0 = Release_v140|x64 {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Debug_Max2011_static|Win32.ActiveCfg = Debug_lib_static_v90|Win32 {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Debug_Max2011_static|Win32.Build.0 = Debug_lib_static_v90|Win32 {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Debug_Max2011_static|x64.ActiveCfg = Debug_lib_static_v90|x64 @@ -1453,6 +1617,12 @@ Global {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Debug_Max2017|Win32.ActiveCfg = Debug_lib_v110|Win32 {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Debug_Max2017|x64.ActiveCfg = Debug_lib_v140|x64 {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Debug_Max2017|x64.Build.0 = Debug_lib_v140|x64 + {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Debug_Max2018_static|Win32.ActiveCfg = Debug_Max2018_static|Win32 + {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Debug_Max2018_static|x64.ActiveCfg = Debug_lib_static_v140|x64 + {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Debug_Max2018_static|x64.Build.0 = Debug_lib_static_v140|x64 + {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Debug_Max2018|Win32.ActiveCfg = Debug_Max2018|Win32 + {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Debug_Max2018|x64.ActiveCfg = Debug_lib_v140|x64 + {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Debug_Max2018|x64.Build.0 = Debug_lib_v140|x64 {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Release_Max2011_static|Win32.ActiveCfg = Release_lib_static_v90|Win32 {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Release_Max2011_static|Win32.Build.0 = Release_lib_static_v90|Win32 {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Release_Max2011_static|x64.ActiveCfg = Release_lib_static_v90|x64 @@ -1507,6 +1677,13 @@ Global {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Release_Max2017|Win32.ActiveCfg = Release_lib_v110|Win32 {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Release_Max2017|x64.ActiveCfg = Release_lib_v140|x64 {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Release_Max2017|x64.Build.0 = Release_lib_v140|x64 + {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Release_Max2018_static|Win32.ActiveCfg = Release_Max2018_static|Win32 + {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Release_Max2018_static|Win32.Build.0 = Release_Max2018_static|Win32 + {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Release_Max2018_static|x64.ActiveCfg = Release_lib_static_v140|x64 + {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Release_Max2018_static|x64.Build.0 = Release_lib_static_v140|x64 + {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 + {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Release_Max2018|x64.ActiveCfg = Release_lib_v140|x64 + {D1D50DE5-1C1D-4322-B076-8B223A5984A4}.Release_Max2018|x64.Build.0 = Release_lib_v140|x64 {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Debug_Max2011_static|Win32.ActiveCfg = Debug_lib_static_v90|Win32 {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Debug_Max2011_static|Win32.Build.0 = Debug_lib_static_v90|Win32 {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Debug_Max2011_static|x64.ActiveCfg = Debug_lib_static_v90|x64 @@ -1561,6 +1738,12 @@ Global {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Debug_Max2017|Win32.ActiveCfg = Debug_lib_v110|Win32 {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Debug_Max2017|x64.ActiveCfg = Debug_lib_v140|x64 {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Debug_Max2017|x64.Build.0 = Debug_lib_v140|x64 + {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Debug_Max2018_static|Win32.ActiveCfg = Debug_Max2018_static|Win32 + {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Debug_Max2018_static|x64.ActiveCfg = Debug_lib_static_v140|x64 + {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Debug_Max2018_static|x64.Build.0 = Debug_lib_static_v140|x64 + {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Debug_Max2018|Win32.ActiveCfg = Debug_Max2018|Win32 + {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Debug_Max2018|x64.ActiveCfg = Debug_lib_v140|x64 + {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Debug_Max2018|x64.Build.0 = Debug_lib_v140|x64 {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Release_Max2011_static|Win32.ActiveCfg = Release_lib_static_v90|Win32 {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Release_Max2011_static|Win32.Build.0 = Release_lib_static_v90|Win32 {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Release_Max2011_static|x64.ActiveCfg = Release_lib_static_v90|x64 @@ -1615,6 +1798,13 @@ Global {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Release_Max2017|Win32.ActiveCfg = Release_lib_v110|Win32 {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Release_Max2017|x64.ActiveCfg = Release_lib_v140|x64 {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Release_Max2017|x64.Build.0 = Release_lib_v140|x64 + {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Release_Max2018_static|Win32.ActiveCfg = Release_Max2018_static|Win32 + {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Release_Max2018_static|Win32.Build.0 = Release_Max2018_static|Win32 + {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Release_Max2018_static|x64.ActiveCfg = Release_lib_static_v140|x64 + {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Release_Max2018_static|x64.Build.0 = Release_lib_static_v140|x64 + {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 + {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Release_Max2018|x64.ActiveCfg = Release_lib_v140|x64 + {12BBEF01-C49C-4DE5-B9C9-8E5BD3F4B0AB}.Release_Max2018|x64.Build.0 = Release_lib_v140|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/COLLADAMax/scripts/COLLADAMax.vcxproj b/COLLADAMax/scripts/COLLADAMax.vcxproj index aefba2447..e0424f3c2 100644 --- a/COLLADAMax/scripts/COLLADAMax.vcxproj +++ b/COLLADAMax/scripts/COLLADAMax.vcxproj @@ -129,6 +129,22 @@ Debug_Max2017 x64 + + Debug_Max2018_static + Win32 + + + Debug_Max2018_static + x64 + + + Debug_Max2018 + Win32 + + + Debug_Max2018 + x64 + Release_Max2011_static Win32 @@ -257,6 +273,22 @@ Release_Max2017 x64 + + Release_Max2018_static + Win32 + + + Release_Max2018_static + x64 + + + Release_Max2018 + Win32 + + + Release_Max2018 + x64 + {8840B0EA-A0B3-45D6-855D-8382B247CE8B} @@ -301,6 +333,12 @@ Unicode true + + DynamicLibrary + v110 + Unicode + true + DynamicLibrary v100 @@ -337,6 +375,12 @@ Unicode true + + DynamicLibrary + v110 + Unicode + true + DynamicLibrary v100 @@ -367,6 +411,11 @@ v110 Unicode + + DynamicLibrary + v110 + Unicode + DynamicLibrary v100 @@ -397,6 +446,11 @@ v110 Unicode + + DynamicLibrary + v110 + Unicode + DynamicLibrary v90 @@ -477,6 +531,12 @@ Unicode true + + DynamicLibrary + v140 + Unicode + true + DynamicLibrary v100 @@ -513,6 +573,12 @@ Unicode true + + DynamicLibrary + v140 + Unicode + true + DynamicLibrary v100 @@ -543,6 +609,11 @@ v140 Unicode + + DynamicLibrary + v140 + Unicode + DynamicLibrary v100 @@ -573,6 +644,11 @@ v140 Unicode + + DynamicLibrary + v140 + Unicode + DynamicLibrary v90 @@ -638,6 +714,9 @@ + + + @@ -656,6 +735,9 @@ + + + @@ -674,6 +756,9 @@ + + + @@ -692,6 +777,9 @@ + + + @@ -734,6 +822,9 @@ + + + @@ -752,6 +843,9 @@ + + + @@ -770,6 +864,9 @@ + + + @@ -788,6 +885,9 @@ + + + @@ -949,6 +1049,12 @@ true false + + ..\bin\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + true + false + ..\bin\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -985,6 +1091,12 @@ true false + + ..\bin\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + true + false + ..\bin\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -1021,6 +1133,12 @@ true false + + ..\bin\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + true + false + ..\bin\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -1057,6 +1175,12 @@ true false + + ..\bin\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + true + false + ..\bin\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -1093,6 +1217,12 @@ false false + + ..\bin\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + false + false + ..\bin\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -1129,6 +1259,12 @@ false false + + ..\bin\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + false + false + ..\bin\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -1165,6 +1301,12 @@ false false + + ..\bin\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + false + false + ..\bin\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -1201,6 +1343,12 @@ false false + + ..\bin\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + false + false + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) @@ -1995,6 +2143,41 @@ copy "$(OutDir)COLLADAMaxNew.dle" "%25MAX_PATH2013%25\plugins\ColladaMaxNew.dle" + + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) + + + Disabled + ..\include;..\res;$(MAX_SDK_PATH2015)\include;..\..\COLLADAFramework\include;..\..\COLLADAFramework\include\Math;..\..\COLLADADomHelper\include;..\..\COLLADAStreamWriter\include;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADASaxFrameworkLoader\include;..\..\G3DWarehouseBrowser\include;$(BOOST_ROOT) + WIN32;_DEBUG;_WINDOWS;_USRDLL;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + true + Use + ColladaMaxStableHeaders.h + Level3 + EditAndContinue + Default + + + maxutil.lib;core.lib;paramblk2.lib;geom.lib;bmm.lib;mesh.lib;mnmath.lib;poly.lib;gup.lib;menus.lib;morpher_2015_x86.lib;comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)New.dle + 1.3 + $(MAX_SDK_PATH2015)/lib;..\lib;%(AdditionalLibraryDirectories) + ;%(IgnoreSpecificDefaultLibraries) + true + Windows + false + + + MachineX86 + + + copy "$(OutDir)COLLADAMaxNew.dle" "%25MAX_PATH2013%25\plugins\ColladaMaxNew.dle" + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) @@ -2222,6 +2405,44 @@ copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2017)plugins\ColladaMaxNew.dle" + + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) + + + X64 + + + Disabled + ..\include;..\res;$(MAX_SDK_PATH2018)\include;..\..\COLLADAFramework\include;..\..\COLLADAFramework\include\Math;..\..\COLLADADomHelper\include;..\..\COLLADAStreamWriter\include;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADASaxFrameworkLoader\include;..\..\G3DWarehouseBrowser\include;$(BOOST_ROOT) + WIN32;_DEBUG;_WINDOWS;_USRDLL;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + true + Use + ColladaMaxStableHeaders.h + Level3 + ProgramDatabase + Default + + + maxutil.lib;core.lib;paramblk2.lib;geom.lib;bmm.lib;mesh.lib;mnmath.lib;poly.lib;gup.lib;menus.lib;morpher_2015_x64.lib;comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)New.dle + 1.3 + $(MAX_SDK_PATH2018)\lib\x64\Release;..\lib;%(AdditionalLibraryDirectories) + ;%(IgnoreSpecificDefaultLibraries) + true + Windows + false + + + MachineX64 + + + copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2017)plugins\ColladaMaxNew.dle" + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) @@ -2431,6 +2652,41 @@ copy "$(OutDir)COLLADAMaxNew.dle" "%25MAX_PATH2013%25\plugins\ColladaMaxNew.dle" + + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) + + + Disabled + ..\include;..\res;$(MAX_SDK_PATH2015)\include;..\..\COLLADAFramework\include;..\..\COLLADAFramework\include\Math;..\..\COLLADADomHelper\include;..\..\COLLADAStreamWriter\include;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADASaxFrameworkLoader\include;..\..\G3DWarehouseBrowser\include;$(BOOST_ROOT) + WIN32;_DEBUG;_WINDOWS;_USRDLL;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + true + Use + ColladaMaxStableHeaders.h + Level3 + EditAndContinue + Default + + + maxutil.lib;core.lib;paramblk2.lib;geom.lib;bmm.lib;mesh.lib;mnmath.lib;poly.lib;gup.lib;menus.lib;morpher_2015_x86.lib;comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)New.dle + 1.3 + $(MAX_SDK_PATH2015)/lib;..\lib;%(AdditionalLibraryDirectories) + ;%(IgnoreSpecificDefaultLibraries) + true + Windows + false + + + MachineX86 + + + copy "$(OutDir)COLLADAMaxNew.dle" "%25MAX_PATH2013%25\plugins\ColladaMaxNew.dle" + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) @@ -2658,6 +2914,44 @@ copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2017)plugins\ColladaMaxNew.dle" + + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) + + + X64 + + + Disabled + ..\include;..\res;$(MAX_SDK_PATH2018)\include;..\..\COLLADAFramework\include;..\..\COLLADAFramework\include\Math;..\..\COLLADADomHelper\include;..\..\COLLADAStreamWriter\include;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADASaxFrameworkLoader\include;..\..\G3DWarehouseBrowser\include;$(BOOST_ROOT) + WIN32;_DEBUG;_WINDOWS;_USRDLL;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + true + Use + ColladaMaxStableHeaders.h + Level3 + ProgramDatabase + Default + + + maxutil.lib;core.lib;paramblk2.lib;geom.lib;bmm.lib;mesh.lib;mnmath.lib;poly.lib;gup.lib;menus.lib;morpher_2015_x64.lib;comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)New.dle + 1.3 + $(MAX_SDK_PATH2018)\lib\x64\Release;..\lib;%(AdditionalLibraryDirectories) + ;%(IgnoreSpecificDefaultLibraries) + true + Windows + false + + + MachineX64 + + + copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2017)plugins\ColladaMaxNew.dle" + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) @@ -2884,6 +3178,44 @@ copy "$(OutDir)COLLADAMaxNew.dle" "%25MAX_PATH2013%25\plugins\ColladaMaxNew.dle" + + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) + + + MaxSpeed + Neither + ..\include;..\res;$(MAX_SDK_PATH2017)\include;..\..\COLLADAFramework\include;..\..\COLLADAFramework\include\Math;..\..\COLLADADomHelper\include;..\..\COLLADAStreamWriter\include;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADASaxFrameworkLoader\include;..\..\G3DWarehouseBrowser\include;$(BOOST_ROOT) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Default + MultiThreadedDLL + false + true + Use + ColladaMaxStableHeaders.h + Level3 + + + + + maxutil.lib;core.lib;paramblk2.lib;geom.lib;bmm.lib;mesh.lib;mnmath.lib;poly.lib;gup.lib;menus.lib;morpher_2015_x86.lib;comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)New.dle + 1.3 + $(MAX_SDK_PATH2017)\lib;..\lib;%(AdditionalLibraryDirectories) + ;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + false + + + MachineX86 + + + copy "$(OutDir)COLLADAMaxNew.dle" "%25MAX_PATH2013%25\plugins\ColladaMaxNew.dle" + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) @@ -3128,6 +3460,47 @@ copy "$(OutDir)COLLADAMaxNew.dle" "%25ADSK_3DSMAX_x64_2012%25\plugins\ColladaMaxNew.dle" + + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) + + + X64 + + + MaxSpeed + Neither + ..\include;..\res;$(MAX_SDK_PATH2017)\include;..\..\COLLADAFramework\include;..\..\COLLADAFramework\include\Math;..\..\COLLADADomHelper\include;..\..\COLLADAStreamWriter\include;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADASaxFrameworkLoader\include;..\..\G3DWarehouseBrowser\include;$(BOOST_ROOT) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Default + MultiThreadedDLL + false + true + Use + ColladaMaxStableHeaders.h + Level3 + + + + + maxutil.lib;core.lib;paramblk2.lib;geom.lib;bmm.lib;mesh.lib;mnmath.lib;poly.lib;gup.lib;menus.lib;morpher_2015_x64.lib;comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)New.dle + 1.3 + $(MAX_SDK_PATH2017)\lib\x64\Release;..\lib;%(AdditionalLibraryDirectories) + ;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + false + + + MachineX64 + + + copy "$(OutDir)COLLADAMaxNew.dle" "%25ADSK_3DSMAX_x64_2012%25\plugins\ColladaMaxNew.dle" + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) @@ -3169,6 +3542,47 @@ copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2017)plugins\ColladaMaxNew.dle" + + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) + + + X64 + + + MaxSpeed + Neither + ..\include;..\res;$(MAX_SDK_PATH2018)\include;..\..\COLLADAFramework\include;..\..\COLLADAFramework\include\Math;..\..\COLLADADomHelper\include;..\..\COLLADAStreamWriter\include;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADASaxFrameworkLoader\include;..\..\G3DWarehouseBrowser\include;$(BOOST_ROOT) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Default + MultiThreadedDLL + false + true + Use + ColladaMaxStableHeaders.h + Level3 + + + + + maxutil.lib;core.lib;paramblk2.lib;geom.lib;bmm.lib;mesh.lib;mnmath.lib;poly.lib;gup.lib;menus.lib;morpher_2015_x64.lib;comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)New.dle + 1.3 + $(MAX_SDK_PATH2018)\lib\x64\Release;..\lib;%(AdditionalLibraryDirectories) + ;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + false + + + MachineX64 + + + copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2017)plugins\ColladaMaxNew.dle" + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) @@ -3395,6 +3809,44 @@ copy "$(OutDir)COLLADAMaxNew.dle" "%25MAX_PATH2013%25\plugins\ColladaMaxNew.dle" + + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) + + + MaxSpeed + Neither + ..\include;..\res;$(MAX_SDK_PATH2016)\include;..\..\COLLADAFramework\include;..\..\COLLADAFramework\include\Math;..\..\COLLADADomHelper\include;..\..\COLLADAStreamWriter\include;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADASaxFrameworkLoader\include;..\..\G3DWarehouseBrowser\include;$(BOOST_ROOT) + WIN32;NDEBUG;_WINDOWS;_USRDLL;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + Default + MultiThreaded + false + true + Use + ColladaMaxStableHeaders.h + Level3 + + + + + maxutil.lib;core.lib;paramblk2.lib;geom.lib;bmm.lib;mesh.lib;mnmath.lib;poly.lib;gup.lib;menus.lib;morpher_2015_x86.lib;comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)New.dle + 1.3 + $(MAX_SDK_PATH2016)\Lib;..\lib;%(AdditionalLibraryDirectories) + ;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + false + + + MachineX86 + + + copy "$(OutDir)COLLADAMaxNew.dle" "%25MAX_PATH2013%25\plugins\ColladaMaxNew.dle" + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) @@ -3639,6 +4091,47 @@ copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2017)plugins\ColladaMaxNew.dle" + + + call create_version_info_h.bat $(PLATFORM) $(CONFIGURATION) + + + X64 + + + MaxSpeed + Neither + ..\include;..\res;$(MAX_SDK_PATH2018)\include;..\..\COLLADAFramework\include;..\..\COLLADAFramework\include\Math;..\..\COLLADADomHelper\include;..\..\COLLADAStreamWriter\include;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADASaxFrameworkLoader\include;..\..\G3DWarehouseBrowser\include;$(BOOST_ROOT) + WIN32;NDEBUG;_WINDOWS;_USRDLL;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + Default + MultiThreaded + false + true + Use + ColladaMaxStableHeaders.h + Level3 + + + + + maxutil.lib;core.lib;paramblk2.lib;geom.lib;bmm.lib;mesh.lib;mnmath.lib;poly.lib;gup.lib;menus.lib;morpher_2015_x64.lib;comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)New.dle + 1.3 + $(MAX_SDK_PATH2018)\lib\x64\Release;..\lib;%(AdditionalLibraryDirectories) + ;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + false + + + MachineX64 + + + copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2017)plugins\ColladaMaxNew.dle" + + @@ -3673,48 +4166,56 @@ $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj @@ -3737,48 +4238,56 @@ $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc @@ -3831,24 +4340,28 @@ Create Create Create + Create Create Create Create Create Create Create + Create Create Create Create Create Create Create + Create Create Create Create Create Create Create + Create Create Create Create @@ -3863,24 +4376,28 @@ Create Create Create + Create Create Create Create Create Create Create + Create Create Create Create Create Create Create + Create Create Create Create Create Create Create + Create @@ -3903,24 +4420,28 @@ true true true + true true true true true true true + true true true true true true true + true true true true true true true + true true true true @@ -3935,24 +4456,28 @@ true true true + true true true true true true true + true true true true true true true + true true true true true true true + true true @@ -3969,24 +4494,28 @@ true true true + true true true true true true true + true true true true true true true + true true true true true true true + true true true true @@ -4001,24 +4530,28 @@ true true true + true true true true true true true + true true true true true true true + true true true true true true true + true diff --git a/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj b/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj index 185ed7176..1f4037251 100644 --- a/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj +++ b/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj @@ -113,6 +113,22 @@ Debug_LibXML x64 + + Debug_Max2018_static + Win32 + + + Debug_Max2018_static + x64 + + + Debug_Max2018 + Win32 + + + Debug_Max2018 + x64 + Release_Expat_NoValidation_static Win32 @@ -257,6 +273,22 @@ Release_LibXML_v90 x64 + + Release_Max2018_static + Win32 + + + Release_Max2018_static + x64 + + + Release_Max2018 + Win32 + + + Release_Max2018 + x64 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A} @@ -288,6 +320,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v100 @@ -344,6 +382,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -402,6 +445,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -431,6 +479,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v110 @@ -466,6 +520,12 @@ Unicode true + + StaticLibrary + v140 + Unicode + true + StaticLibrary v100 @@ -522,6 +582,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + StaticLibrary v120 @@ -580,6 +645,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + StaticLibrary v120 @@ -609,6 +679,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v140 @@ -635,6 +711,9 @@ + + + @@ -665,6 +744,9 @@ + + + @@ -698,6 +780,9 @@ + + + @@ -713,6 +798,9 @@ + + + @@ -731,6 +819,9 @@ + + + @@ -761,6 +852,9 @@ + + + @@ -794,6 +888,9 @@ + + + @@ -809,6 +906,9 @@ + + + @@ -839,6 +939,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -855,6 +959,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -891,6 +999,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -907,6 +1019,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -979,6 +1095,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -995,6 +1115,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -1047,6 +1171,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -1063,6 +1191,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -1173,6 +1305,25 @@ $(OutDir)$(ProjectName).lib + + + MaxSpeed + true + ..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + false + Use + COLLADASaxFWLStableHeaders.h + Level3 + + + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -1258,6 +1409,28 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + MaxSpeed + true + ..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;GENERATEDSAXPARSER_VALIDATION;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + false + Use + COLLADASaxFWLStableHeaders.h + Level3 + + + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1436,6 +1609,25 @@ $(OutDir)$(ProjectName).lib + + + Disabled + ..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + false + Use + COLLADASaxFWLStableHeaders.h + Level3 + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1524,6 +1716,28 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + Disabled + ..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + false + Use + COLLADASaxFWLStableHeaders.h + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + Disabled @@ -1882,6 +2096,25 @@ $(OutDir)$(ProjectName).lib + + + Disabled + ..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + false + Use + COLLADASaxFWLStableHeaders.h + Level3 + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1970,6 +2203,28 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + Disabled + ..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + false + Use + COLLADASaxFWLStableHeaders.h + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -2228,6 +2483,25 @@ $(OutDir)$(ProjectName).lib + + + MaxSpeed + true + ..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreaded + true + false + Use + COLLADASaxFWLStableHeaders.h + Level3 + + + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -2313,6 +2587,28 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + MaxSpeed + true + ..\include;..\include\generated14;..\include\generated15;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;..\..\Externals\pcre\include;..\..\Externals\MathMLSolver\include;..\..\Externals\MathMLSolver\include\AST;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;GENERATEDSAXPARSER_XMLPARSER_LIBXML;PCRE_STATIC;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreaded + true + false + Use + COLLADASaxFWLStableHeaders.h + Level3 + + + + + $(OutDir)$(ProjectName).lib + + X64 @@ -2429,18 +2725,22 @@ Create Create Create + Create Create Create Create Create + Create Create Create Create Create + Create Create Create Create Create + Create Create Create Create @@ -2456,10 +2756,12 @@ Create Create Create + Create Create Create Create Create + Create Create Create Create @@ -2476,10 +2778,12 @@ Create Create Create + Create Create Create Create Create + Create Create @@ -2512,18 +2816,22 @@ true true true + true true true true true + true true true true true + true true true true true + true true true true @@ -2531,10 +2839,12 @@ true true true + true true true true true + true true true true @@ -2570,18 +2880,22 @@ true true true + true true true true true + true true true true true + true true true true true + true true true true @@ -2589,10 +2903,12 @@ true true true + true true true true true + true true true true diff --git a/COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcxproj b/COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcxproj index 98665724b..5577109bd 100644 --- a/COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcxproj +++ b/COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcxproj @@ -1,6 +1,22 @@  + + Debug_Max2018_static + Win32 + + + Debug_Max2018_static + x64 + + + Debug_Max2018 + Win32 + + + Debug_Max2018 + x64 + Debug_static_v100 Win32 @@ -81,6 +97,22 @@ Debug x64 + + Release_Max2018_static + Win32 + + + Release_Max2018_static + x64 + + + Release_Max2018 + Win32 + + + Release_Max2018 + x64 + Release_static_v100 Win32 @@ -198,6 +230,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v120 @@ -223,6 +261,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -247,6 +290,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v110 @@ -278,6 +327,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -308,6 +362,12 @@ Unicode true + + StaticLibrary + v140 + Unicode + true + StaticLibrary v120 @@ -333,6 +393,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + StaticLibrary v120 @@ -357,6 +422,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v140 @@ -388,6 +459,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + @@ -406,6 +482,9 @@ + + + @@ -421,6 +500,9 @@ + + + @@ -433,6 +515,9 @@ + + + @@ -451,6 +536,9 @@ + + + @@ -466,6 +554,9 @@ + + + @@ -481,6 +572,9 @@ + + + @@ -493,6 +587,9 @@ + + + @@ -511,6 +608,9 @@ + + + <_ProjectFileVersion>12.0.30501.0 @@ -535,6 +635,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -555,6 +659,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -571,6 +679,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -591,6 +703,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -615,6 +731,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -635,6 +755,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -655,6 +779,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -675,6 +803,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + Disabled @@ -764,6 +896,24 @@ $(OutDir)$(ProjectName).lib + + + Disabled + ..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + + + Level2 + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + X64 @@ -868,6 +1018,27 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + Disabled + ..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + + + Level2 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -934,6 +1105,23 @@ $(OutDir)$(ProjectName).lib + + + MaxSpeed + ..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + false + + + Level2 + + + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -1029,6 +1217,26 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + MaxSpeed + ..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreadedDLL + false + + + Level2 + + + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1138,6 +1346,24 @@ $(OutDir)$(ProjectName).lib + + + Disabled + ..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + + + Level2 + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1242,6 +1468,27 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + Disabled + ..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + + + Level2 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -1325,6 +1572,23 @@ $(OutDir)$(ProjectName).lib + + + MaxSpeed + ..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreaded + false + + + Level2 + + + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1423,6 +1687,26 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + MaxSpeed + ..\include;..\..\Externals\UTF\include;..\..\COLLADABaseUtils\include;..\..\common\libBuffer\include;..\..\common\libftoa\include;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreaded + false + + + Level2 + + + + + $(OutDir)$(ProjectName).lib + + diff --git a/Externals/LibXML/scripts/LibXML.vcxproj b/Externals/LibXML/scripts/LibXML.vcxproj index 492d4210b..c66a56e19 100644 --- a/Externals/LibXML/scripts/LibXML.vcxproj +++ b/Externals/LibXML/scripts/LibXML.vcxproj @@ -1,6 +1,22 @@  + + Debug_Max2018_static + Win32 + + + Debug_Max2018_static + x64 + + + Debug_Max2018 + Win32 + + + Debug_Max2018 + x64 + Debug_static_v100 Win32 @@ -81,6 +97,22 @@ Debug x64 + + Release_Max2018_static + Win32 + + + Release_Max2018_static + x64 + + + Release_Max2018 + Win32 + + + Release_Max2018 + x64 + Release_static_v100 Win32 @@ -198,6 +230,12 @@ true Unicode + + StaticLibrary + v110 + true + Unicode + StaticLibrary v120 @@ -223,6 +261,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -247,6 +290,12 @@ true Unicode + + StaticLibrary + v110 + true + Unicode + StaticLibrary v110 @@ -278,6 +327,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -308,6 +362,12 @@ Unicode true + + StaticLibrary + v140 + Unicode + true + StaticLibrary v120 @@ -333,6 +393,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + StaticLibrary v120 @@ -357,6 +422,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v140 @@ -388,6 +459,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + @@ -406,6 +482,9 @@ + + + @@ -421,6 +500,9 @@ + + + @@ -433,6 +515,9 @@ + + + @@ -451,6 +536,9 @@ + + + @@ -466,6 +554,9 @@ + + + @@ -481,6 +572,9 @@ + + + @@ -493,6 +587,9 @@ + + + @@ -511,6 +608,9 @@ + + + <_ProjectFileVersion>12.0.30501.0 @@ -535,6 +635,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -555,6 +659,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -571,6 +679,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -591,6 +703,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -615,6 +731,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -635,6 +755,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -655,6 +779,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -675,6 +803,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + Disabled @@ -740,6 +872,19 @@ $(OutDir)$(ProjectName).lib + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;LIBXML_STATIC;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + false + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + X64 @@ -868,6 +1013,32 @@ + + + X64 + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + + + Level3 + ProgramDatabase + + + /MACHINE:x64 %(AdditionalOptions) + $(OutDir)$(ProjectName).lib + + + + + + MaxSpeed @@ -920,6 +1091,19 @@ $(OutDir)$(ProjectName).lib + + + MaxSpeed + true + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;LIBXML_STATIC;%(PreprocessorDefinitions) + MultiThreadedDLL + false + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -1039,6 +1223,33 @@ + + + X64 + + + MaxSpeed + Speed + true + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions) + MultiThreadedDLL + false + false + + + Level3 + ProgramDatabase + + + /MACHINE:x64 %(AdditionalOptions) + $(OutDir)$(ProjectName).lib + + + + + + X64 @@ -1131,6 +1342,19 @@ $(OutDir)$(ProjectName).lib + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;LIBXML_STATIC;%(PreprocessorDefinitions) + MultiThreadedDebug + false + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1259,6 +1483,32 @@ + + + X64 + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + + + Level3 + ProgramDatabase + + + /MACHINE:x64 %(AdditionalOptions) + $(OutDir)$(ProjectName).lib + + + + + + MaxSpeed @@ -1324,6 +1574,19 @@ $(OutDir)$(ProjectName).lib + + + MaxSpeed + true + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;LIBXML_STATIC;%(PreprocessorDefinitions) + MultiThreaded + false + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1457,6 +1720,33 @@ + + + X64 + + + MaxSpeed + Speed + true + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + false + + + Level3 + ProgramDatabase + + + /MACHINE:x64 %(AdditionalOptions) + $(OutDir)$(ProjectName).lib + + + + + + diff --git a/Externals/MathMLSolver/scripts/MathMLSolver.vcxproj b/Externals/MathMLSolver/scripts/MathMLSolver.vcxproj index 35bf68f4a..e24a32d49 100644 --- a/Externals/MathMLSolver/scripts/MathMLSolver.vcxproj +++ b/Externals/MathMLSolver/scripts/MathMLSolver.vcxproj @@ -1,6 +1,22 @@  + + Debug_Max2018_static + Win32 + + + Debug_Max2018_static + x64 + + + Debug_Max2018 + Win32 + + + Debug_Max2018 + x64 + Debug_static_v100 Win32 @@ -81,6 +97,22 @@ Debug x64 + + Release_Max2018_static + Win32 + + + Release_Max2018_static + x64 + + + Release_Max2018 + Win32 + + + Release_Max2018 + x64 + Release_ProgDB_static Win32 @@ -214,6 +246,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v100 @@ -240,6 +278,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v100 @@ -275,6 +318,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v110 @@ -306,6 +355,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -336,6 +390,12 @@ Unicode true + + StaticLibrary + v140 + Unicode + true + StaticLibrary v100 @@ -362,6 +422,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + StaticLibrary v100 @@ -397,6 +462,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v140 @@ -428,6 +499,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + @@ -446,6 +522,9 @@ + + + @@ -461,6 +540,9 @@ + + + @@ -479,6 +561,9 @@ + + + @@ -497,6 +582,9 @@ + + + @@ -512,6 +600,9 @@ + + + @@ -527,6 +618,9 @@ + + + @@ -545,6 +639,9 @@ + + + @@ -563,6 +660,9 @@ + + + <_ProjectFileVersion>12.0.30501.0 @@ -587,6 +687,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -607,6 +711,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -623,6 +731,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -643,6 +755,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -671,6 +787,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -691,6 +811,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -711,6 +835,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -731,6 +859,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -861,6 +993,30 @@ + + + Disabled + ..\include;..\include\AST;..\..\LibXML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;MATHMLSOLVER_EXPORTS;%(PreprocessorDefinitions) + true + Sync + EnableFastChecks + MultiThreadedDebugDLL + false + + + MathMLSolverStableHeaders.h + Level3 + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + + + + + X64 @@ -994,6 +1150,33 @@ + + + X64 + + + Disabled + ..\include;..\include\AST;..\..\LibXML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;MATHMLSOLVER_EXPORTS;%(PreprocessorDefinitions) + true + Sync + EnableFastChecks + MultiThreadedDebugDLL + false + + + MathMLSolverStableHeaders.h + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + + MaxSpeed @@ -1087,6 +1270,30 @@ + + + MaxSpeed + true + ..\include;..\include\AST;..\..\LibXML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;MATHMLSOLVER_EXPORTS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + false + + + MathMLSolverStableHeaders.h + Level3 + + + + + $(OutDir)$(ProjectName).lib + + + + + + MaxSpeed @@ -1213,6 +1420,32 @@ + + + X64 + + + MaxSpeed + true + ..\include;..\include\AST;..\..\LibXML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;MATHMLSOLVER_EXPORTS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + false + + + MathMLSolverStableHeaders.h + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + + X64 @@ -1378,6 +1611,30 @@ + + + Disabled + ..\include;..\include\AST;..\..\LibXML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;MATHMLSOLVER_EXPORTS;%(PreprocessorDefinitions) + true + Sync + EnableFastChecks + MultiThreadedDebug + false + + + MathMLSolverStableHeaders.h + Level3 + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + + + + + Disabled @@ -1508,6 +1765,33 @@ + + + X64 + + + Disabled + ..\include;..\include\AST;..\..\LibXML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;MATHMLSOLVER_EXPORTS;%(PreprocessorDefinitions) + true + Sync + EnableFastChecks + MultiThreadedDebug + false + + + MathMLSolverStableHeaders.h + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + + X64 @@ -1628,6 +1912,30 @@ + + + MaxSpeed + true + ..\include;..\include\AST;..\..\LibXML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;MATHMLSOLVER_EXPORTS;%(PreprocessorDefinitions) + Sync + MultiThreaded + false + + + MathMLSolverStableHeaders.h + Level3 + + + + + $(OutDir)$(ProjectName).lib + + + + + + MaxSpeed @@ -1754,6 +2062,32 @@ + + + X64 + + + MaxSpeed + true + ..\include;..\include\AST;..\..\LibXML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;MATHMLSOLVER_EXPORTS;%(PreprocessorDefinitions) + Sync + MultiThreaded + false + + + MathMLSolverStableHeaders.h + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + + X64 @@ -1844,22 +2178,26 @@ Create Create Create + Create Create Create Create Create Create + Create Create Create Create Create Create Create + Create Create Create Create Create Create + Create Create Create Create @@ -1868,21 +2206,25 @@ Create Create Create + Create Create Create Create Create Create + Create Create Create Create Create Create + Create Create Create Create Create Create + Create Create diff --git a/Externals/pcre/scripts/pcre.vcxproj b/Externals/pcre/scripts/pcre.vcxproj index 8e1f0d198..04eaf94f2 100644 --- a/Externals/pcre/scripts/pcre.vcxproj +++ b/Externals/pcre/scripts/pcre.vcxproj @@ -1,6 +1,22 @@  + + Debug_Max2018_static + Win32 + + + Debug_Max2018_static + x64 + + + Debug_Max2018 + Win32 + + + Debug_Max2018 + x64 + Debug_static_v100 Win32 @@ -81,6 +97,22 @@ Debug x64 + + Release_Max2018_static + Win32 + + + Release_Max2018_static + x64 + + + Release_Max2018 + Win32 + + + Release_Max2018 + x64 + Release_static_v100 Win32 @@ -198,6 +230,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v120 @@ -223,6 +261,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -247,6 +290,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v110 @@ -278,6 +327,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -308,6 +362,12 @@ Unicode true + + StaticLibrary + v140 + Unicode + true + StaticLibrary v120 @@ -333,6 +393,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + StaticLibrary v120 @@ -357,6 +422,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v140 @@ -388,6 +459,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + @@ -406,6 +482,9 @@ + + + @@ -421,6 +500,9 @@ + + + @@ -433,6 +515,9 @@ + + + @@ -451,6 +536,9 @@ + + + @@ -466,6 +554,9 @@ + + + @@ -481,6 +572,9 @@ + + + @@ -493,6 +587,9 @@ + + + @@ -511,6 +608,9 @@ + + + <_ProjectFileVersion>12.0.30501.0 @@ -535,6 +635,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -555,6 +659,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -571,6 +679,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -591,6 +703,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -615,6 +731,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -635,6 +755,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -655,6 +779,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -675,6 +803,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) @@ -782,6 +914,32 @@ if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) + + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;PCRE_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + + + Level3 + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + + copy /y "$(TargetPath)" ..\bin\$(Configuration)\ + + + + + if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) +if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) @@ -923,6 +1081,35 @@ if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) + + + + X64 + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_CONSOLE;PCRE_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + copy /y "$(TargetPath)" ..\bin\$(Configuration)\ + + + + + if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) +if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) @@ -1025,6 +1212,31 @@ if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) + + + + MaxSpeed + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;PCRE_STATIC;%(PreprocessorDefinitions) + MultiThreadedDLL + false + + + Level3 + + + + + $(OutDir)$(ProjectName).lib + + + copy /y "$(TargetPath)" ..\bin\$(Configuration)\ + + + + + if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) +if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) @@ -1155,6 +1367,33 @@ if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) + + + + X64 + + + MaxSpeed + ..\include;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_CONSOLE;PCRE_STATIC;%(PreprocessorDefinitions) + MultiThreadedDLL + false + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + copy /y "$(TargetPath)" ..\bin\$(Configuration)\ + + + + + if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) +if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) @@ -1312,6 +1551,32 @@ if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) + + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;PCRE_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + + + Level3 + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + + copy /y "$(TargetPath)" ..\bin\$(Configuration)\ + + + + + if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) +if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) @@ -1453,6 +1718,35 @@ if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) + + + + X64 + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_CONSOLE;PCRE_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + copy /y "$(TargetPath)" ..\bin\$(Configuration)\ + + + + + if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) +if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) @@ -1580,6 +1874,31 @@ if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) + + + + MaxSpeed + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;PCRE_STATIC;%(PreprocessorDefinitions) + MultiThreaded + false + + + Level3 + + + + + $(OutDir)$(ProjectName).lib + + + copy /y "$(TargetPath)" ..\bin\$(Configuration)\ + + + + + if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) +if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) @@ -1712,6 +2031,33 @@ if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) + + + + X64 + + + MaxSpeed + ..\include;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_CONSOLE;PCRE_STATIC;%(PreprocessorDefinitions) + MultiThreaded + false + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + copy /y "$(TargetPath)" ..\bin\$(Configuration)\ + + + + + if not exist ..\obj\$(Configuration) mkdir ..\obj\$(Configuration) +if not exist ..\bin\$(Configuration) mkdir ..\bin\$(Configuration) diff --git a/Externals/zlib/scripts/zlib.vcxproj b/Externals/zlib/scripts/zlib.vcxproj index 884bbafbf..42333b8fd 100644 --- a/Externals/zlib/scripts/zlib.vcxproj +++ b/Externals/zlib/scripts/zlib.vcxproj @@ -1,6 +1,22 @@  + + Debug_Max2018_static + Win32 + + + Debug_Max2018_static + x64 + + + Debug_Max2018 + Win32 + + + Debug_Max2018 + x64 + Debug_static_v100 Win32 @@ -129,6 +145,22 @@ LIB ASM Release x64 + + Release_Max2018_static + Win32 + + + Release_Max2018_static + x64 + + + Release_Max2018 + Win32 + + + Release_Max2018 + x64 + Release_static_v100 Win32 @@ -245,6 +277,12 @@ false Unicode + + StaticLibrary + v110 + false + Unicode + StaticLibrary v120 @@ -275,6 +313,12 @@ false Unicode + + StaticLibrary + v110 + false + Unicode + Application v120 @@ -304,6 +348,12 @@ false Unicode + + StaticLibrary + v110 + false + Unicode + StaticLibrary v110 @@ -333,6 +383,12 @@ false Unicode + + StaticLibrary + v110 + false + Unicode + StaticLibrary v100 @@ -395,6 +451,12 @@ false Unicode + + StaticLibrary + v140 + false + Unicode + StaticLibrary v120 @@ -425,6 +487,12 @@ false Unicode + + StaticLibrary + v140 + false + Unicode + StaticLibrary v120 @@ -455,6 +523,12 @@ false Unicode + + StaticLibrary + v110 + false + Unicode + StaticLibrary v140 @@ -485,6 +559,12 @@ false Unicode + + StaticLibrary + v140 + false + Unicode + StaticLibrary v100 @@ -544,6 +624,10 @@ + + + + @@ -564,6 +648,10 @@ + + + + @@ -583,6 +671,10 @@ + + + + @@ -602,6 +694,10 @@ + + + + @@ -642,6 +738,10 @@ + + + + @@ -662,6 +762,10 @@ + + + + @@ -682,6 +786,10 @@ + + + + @@ -702,6 +810,10 @@ + + + + @@ -777,6 +889,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -797,6 +913,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -830,6 +950,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -850,6 +974,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -882,6 +1010,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -902,6 +1034,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -922,6 +1058,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -942,6 +1082,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + false @@ -1242,6 +1386,38 @@ .\Win32_LIB_Debug/zlib.bsc + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + + + $(IntDir) + $(IntDir) + $(IntDir)vc80.pdb + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).lib + true + MachineX86 + + + true + .\Win32_LIB_Debug/zlib.bsc + + Disabled @@ -1407,6 +1583,40 @@ .\Win32_LIB_Debug/zlib.bsc + + + X64 + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + + + $(IntDir) + $(IntDir) + $(IntDir)vc80.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).lib + true + + + true + .\Win32_LIB_Debug/zlib.bsc + + X64 @@ -1659,6 +1869,38 @@ .\Win32_LIB_Release/zlib.bsc + + + MaxSpeed + OnlyExplicitInline + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + false + + + $(IntDir) + $(IntDir) + $(IntDir)vc80.pdb + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).lib + true + MachineX86 + + + true + .\Win32_LIB_Release/zlib.bsc + + MaxSpeed @@ -1828,6 +2070,40 @@ .\Win32_LIB_Release/zlib.bsc + + + X64 + + + MaxSpeed + OnlyExplicitInline + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + false + + + $(IntDir) + $(IntDir) + $(IntDir)vc80.pdb + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).lib + true + + + true + .\Win32_LIB_Release/zlib.bsc + + X64 @@ -2063,6 +2339,38 @@ .\Win32_LIB_Debug/zlib.bsc + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + + + $(IntDir) + $(IntDir) + $(IntDir)vc80.pdb + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).lib + true + MachineX86 + + + true + .\Win32_LIB_Debug/zlib.bsc + + X64 @@ -2234,6 +2542,40 @@ .\Win32_LIB_Debug/zlib.bsc + + + X64 + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + + + $(IntDir) + $(IntDir) + $(IntDir)vc80.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).lib + true + + + true + .\Win32_LIB_Debug/zlib.bsc + + MaxSpeed @@ -2393,6 +2735,38 @@ .\Win32_LIB_Release/zlib.bsc + + + MaxSpeed + OnlyExplicitInline + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;%(PreprocessorDefinitions) + true + MultiThreaded + true + false + + + $(IntDir) + $(IntDir) + $(IntDir)vc80.pdb + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).lib + true + MachineX86 + + + true + .\Win32_LIB_Release/zlib.bsc + + X64 @@ -2564,6 +2938,40 @@ .\Win32_LIB_Release/zlib.bsc + + + X64 + + + MaxSpeed + OnlyExplicitInline + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;%(PreprocessorDefinitions) + true + MultiThreaded + true + false + + + $(IntDir) + $(IntDir) + $(IntDir)vc80.pdb + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).lib + true + + + true + .\Win32_LIB_Release/zlib.bsc + + diff --git a/Externals/zziplib/scripts/zzip.vcxproj b/Externals/zziplib/scripts/zzip.vcxproj index 3274903bd..0b57d9604 100644 --- a/Externals/zziplib/scripts/zzip.vcxproj +++ b/Externals/zziplib/scripts/zzip.vcxproj @@ -1,6 +1,22 @@  + + Debug_Max2018_static + Win32 + + + Debug_Max2018_static + x64 + + + Debug_Max2018 + Win32 + + + Debug_Max2018 + x64 + Debug_static_v100 Win32 @@ -81,6 +97,22 @@ Debug x64 + + Release_Max2018_static + Win32 + + + Release_Max2018_static + x64 + + + Release_Max2018 + Win32 + + + Release_Max2018 + x64 + Release_static_v100 Win32 @@ -188,6 +220,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v100 @@ -208,6 +245,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v110 @@ -233,6 +275,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v90 @@ -268,6 +315,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -288,6 +340,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + StaticLibrary v100 @@ -308,6 +365,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v140 @@ -333,6 +395,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + StaticLibrary v90 @@ -368,6 +435,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + @@ -387,6 +459,10 @@ + + + + @@ -403,6 +479,10 @@ + + + + @@ -423,6 +503,10 @@ + + + + @@ -451,6 +535,10 @@ + + + + @@ -467,6 +555,10 @@ + + + + @@ -483,6 +575,10 @@ + + + + @@ -503,6 +599,10 @@ + + + + @@ -531,6 +631,10 @@ + + + + <_ProjectFileVersion>12.0.30501.0 @@ -555,6 +659,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -575,6 +683,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -599,6 +711,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -619,6 +735,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -639,6 +759,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -655,6 +779,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -675,6 +803,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -691,6 +823,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -799,6 +935,27 @@ $(OutDir)$(ProjectName).lib + + + Disabled + ..\include;..\..\zlib\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + + + Level3 + EditAndContinue + + + C:\lib\zziplib;%(AdditionalIncludeDirectories) + + + $(OutDir)$(ProjectName).lib + + X64 @@ -918,6 +1075,30 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + Disabled + ..\include;..\..\zlib\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + + + Level3 + ProgramDatabase + + + C:\lib\zziplib;%(AdditionalIncludeDirectories) + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -1042,6 +1223,27 @@ $(OutDir)$(ProjectName).lib + + + Disabled + ..\include;..\..\zlib\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + + + Level3 + EditAndContinue + + + C:\lib\zziplib;%(AdditionalIncludeDirectories) + + + $(OutDir)$(ProjectName).lib + + Disabled @@ -1158,6 +1360,30 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + Disabled + ..\include;..\..\zlib\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + + + Level3 + ProgramDatabase + + + C:\lib\zziplib;%(AdditionalIncludeDirectories) + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1261,6 +1487,26 @@ $(OutDir)$(ProjectName).lib + + + MaxSpeed + OnlyExplicitInline + true + ..\include;..\..\zlib\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + true + false + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -1341,6 +1587,26 @@ $(OutDir)$(ProjectName).lib + + + MaxSpeed + OnlyExplicitInline + true + ..\include;..\..\zlib\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + false + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -1452,6 +1718,29 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + MaxSpeed + OnlyExplicitInline + true + ..\include;..\..\zlib\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + true + false + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1544,6 +1833,29 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + MaxSpeed + OnlyExplicitInline + true + ..\include;..\..\zlib\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + false + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + X64 diff --git a/G3DWarehouseBrowser/scripts/G3DWarehouseBrowser.vcxproj b/G3DWarehouseBrowser/scripts/G3DWarehouseBrowser.vcxproj index 83c16f764..5ca11b8bb 100644 --- a/G3DWarehouseBrowser/scripts/G3DWarehouseBrowser.vcxproj +++ b/G3DWarehouseBrowser/scripts/G3DWarehouseBrowser.vcxproj @@ -1,6 +1,22 @@  + + Debug_Max2018_static + Win32 + + + Debug_Max2018_static + x64 + + + Debug_Max2018 + Win32 + + + Debug_Max2018 + x64 + Debug_static_v100 Win32 @@ -81,6 +97,22 @@ Debug x64 + + Release_Max2018_static + Win32 + + + Release_Max2018_static + x64 + + + Release_Max2018 + Win32 + + + Release_Max2018 + x64 + Release_static_v100 Win32 @@ -198,6 +230,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v120 @@ -223,6 +261,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -247,6 +290,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v110 @@ -278,6 +327,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -308,6 +362,12 @@ Unicode true + + StaticLibrary + v140 + Unicode + true + StaticLibrary v120 @@ -333,6 +393,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + StaticLibrary v120 @@ -357,6 +422,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v140 @@ -388,6 +459,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + @@ -406,6 +482,9 @@ + + + @@ -421,6 +500,9 @@ + + + @@ -433,6 +515,9 @@ + + + @@ -451,6 +536,9 @@ + + + @@ -466,6 +554,9 @@ + + + @@ -481,6 +572,9 @@ + + + @@ -493,6 +587,9 @@ + + + @@ -511,6 +608,9 @@ + + + <_ProjectFileVersion>12.0.30501.0 @@ -535,6 +635,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -555,6 +659,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -571,6 +679,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -591,6 +703,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -615,6 +731,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -635,6 +755,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -655,6 +779,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -675,6 +803,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + Disabled @@ -759,6 +891,23 @@ EditAndContinue + + + Disabled + ..\include;..\..\Externals\zziplib\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + Use + G3DStableHeaders.h + + + Level3 + EditAndContinue + + X64 @@ -858,6 +1007,26 @@ ProgramDatabase + + + X64 + + + Disabled + ..\include;..\..\Externals\zziplib\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + Use + G3DStableHeaders.h + + + Level3 + ProgramDatabase + + MaxSpeed @@ -910,6 +1079,19 @@ ProgramDatabase + + + MaxSpeed + ..\include;..\..\Externals\zziplib\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreadedDLL + false + Use + G3DStableHeaders.h + Level3 + ProgramDatabase + + MaxSpeed @@ -987,6 +1169,22 @@ ProgramDatabase + + + X64 + + + MaxSpeed + ..\include;..\..\Externals\zziplib\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreadedDLL + false + Use + G3DStableHeaders.h + Level3 + ProgramDatabase + + X64 @@ -1087,6 +1285,23 @@ EditAndContinue + + + Disabled + ..\include;..\..\Externals\zziplib\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + Use + G3DStableHeaders.h + + + Level3 + EditAndContinue + + X64 @@ -1186,6 +1401,26 @@ ProgramDatabase + + + X64 + + + Disabled + ..\include;..\..\Externals\zziplib\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + Use + G3DStableHeaders.h + + + Level3 + ProgramDatabase + + MaxSpeed @@ -1251,6 +1486,19 @@ ProgramDatabase + + + MaxSpeed + ..\include;..\..\Externals\zziplib\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreaded + false + Use + G3DStableHeaders.h + Level3 + ProgramDatabase + + X64 @@ -1331,6 +1579,22 @@ ProgramDatabase + + + X64 + + + MaxSpeed + ..\include;..\..\Externals\zziplib\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreaded + false + Use + G3DStableHeaders.h + Level3 + ProgramDatabase + + @@ -1344,40 +1608,48 @@ Create Create Create + Create Create Create Create Create Create + Create Create Create Create Create Create + Create Create Create Create Create Create + Create Create Create Create Create Create + Create Create Create Create Create Create + Create Create Create Create Create + Create Create Create Create Create Create + Create Create diff --git a/GeneratedSaxParser/scripts/GeneratedSaxParser.vcxproj b/GeneratedSaxParser/scripts/GeneratedSaxParser.vcxproj index 609104a3b..cd4ddb54b 100644 --- a/GeneratedSaxParser/scripts/GeneratedSaxParser.vcxproj +++ b/GeneratedSaxParser/scripts/GeneratedSaxParser.vcxproj @@ -97,6 +97,22 @@ Debug_LibXML x64 + + Debug_Max2018_static + Win32 + + + Debug_Max2018_static + x64 + + + Debug_Max2018 + Win32 + + + Debug_Max2018 + x64 + Release_Expat_static Win32 @@ -209,6 +225,22 @@ Release_LibXML x64 + + Release_Max2018_static + Win32 + + + Release_Max2018_static + x64 + + + Release_Max2018 + Win32 + + + Release_Max2018 + x64 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF} @@ -252,6 +284,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v120 @@ -283,6 +321,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -329,6 +372,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v110 @@ -360,6 +409,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -396,6 +450,12 @@ Unicode true + + StaticLibrary + v140 + Unicode + true + StaticLibrary v120 @@ -427,6 +487,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + StaticLibrary v120 @@ -473,6 +538,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v140 @@ -504,6 +575,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + @@ -525,6 +601,9 @@ + + + @@ -543,6 +622,9 @@ + + + @@ -567,6 +649,9 @@ + + + @@ -585,6 +670,9 @@ + + + @@ -603,6 +691,9 @@ + + + @@ -621,6 +712,9 @@ + + + @@ -645,6 +739,9 @@ + + + @@ -663,6 +760,9 @@ + + + <_ProjectFileVersion>12.0.30501.0 @@ -687,6 +787,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -707,6 +811,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -723,6 +831,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -743,6 +855,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -799,6 +915,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -819,6 +939,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -847,6 +971,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -867,6 +995,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -964,6 +1096,24 @@ $(OutDir)$(ProjectName).lib + + + Disabled + ..\include;..\..\Externals\LibXML\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + + + Level3 + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1068,6 +1218,27 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + Disabled + ..\include;..\..\Externals\LibXML\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -1138,6 +1309,24 @@ $(OutDir)$(ProjectName).lib + + + MaxSpeed + true + ..\include;..\..\Externals\LibXML\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreadedDLL + false + + + Level3 + + + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -1235,6 +1424,26 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + MaxSpeed + true + ..\include;..\..\Externals\LibXML\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreadedDLL + false + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1488,6 +1697,24 @@ $(OutDir)$(ProjectName).lib + + + Disabled + ..\include;..\..\Externals\LibXML\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + + + Level3 + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1592,6 +1819,27 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + Disabled + ..\include;..\..\Externals\LibXML\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -1715,6 +1963,24 @@ $(OutDir)$(ProjectName).lib + + + MaxSpeed + true + ..\include;..\..\Externals\LibXML\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreaded + false + + + Level3 + + + + + $(OutDir)$(ProjectName).lib + + X64 @@ -1814,6 +2080,26 @@ $(OutDir)$(ProjectName).lib + + + X64 + + + MaxSpeed + true + ..\include;..\..\Externals\LibXML\include;..\..\COLLADABaseUtils\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;IWILLNOTUSEASSERTSOUTSIDETHISSCOPE;%(PreprocessorDefinitions) + MultiThreaded + false + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + MaxSpeed @@ -1857,21 +2143,25 @@ true true true + true true true true true true + true true true true true true + true true true true true true + true true true true @@ -1881,20 +2171,24 @@ true true true + true true true true true true + true true true true true + true true true true true true + true true diff --git a/common/libBuffer/scripts/libBuffer.vcxproj b/common/libBuffer/scripts/libBuffer.vcxproj index 875adb65f..caa9f35d9 100644 --- a/common/libBuffer/scripts/libBuffer.vcxproj +++ b/common/libBuffer/scripts/libBuffer.vcxproj @@ -97,6 +97,22 @@ Debug_lib x64 + + Debug_Max2018_static + Win32 + + + Debug_Max2018_static + x64 + + + Debug_Max2018 + Win32 + + + Debug_Max2018 + x64 + Debug_performanceTest Win32 @@ -209,6 +225,22 @@ Release_lib x64 + + Release_Max2018_static + Win32 + + + Release_Max2018_static + x64 + + + Release_Max2018 + Win32 + + + Release_Max2018 + x64 + Release_performanceTest Win32 @@ -273,6 +305,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v120 @@ -298,6 +336,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -355,6 +398,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v110 @@ -386,6 +435,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -427,6 +481,12 @@ Unicode true + + StaticLibrary + v140 + Unicode + true + StaticLibrary v120 @@ -452,6 +512,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + StaticLibrary v120 @@ -509,6 +574,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v140 @@ -540,6 +611,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + @@ -564,6 +640,9 @@ + + + @@ -579,6 +658,9 @@ + + + @@ -609,6 +691,9 @@ + + + @@ -627,6 +712,9 @@ + + + @@ -648,6 +736,9 @@ + + + @@ -663,6 +754,9 @@ + + + @@ -693,6 +787,9 @@ + + + @@ -711,6 +808,9 @@ + + + <_ProjectFileVersion>12.0.30501.0 @@ -735,6 +835,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -755,6 +859,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -771,6 +879,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -791,6 +903,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -875,6 +991,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -895,6 +1015,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -915,6 +1039,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -935,6 +1063,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -1025,6 +1157,21 @@ EditAndContinue + + + Disabled + ..\include;..\..\libftoa\include;..\..\..\Externals\UTF\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + + + Level3 + EditAndContinue + + X64 @@ -1114,6 +1261,24 @@ ProgramDatabase + + + X64 + + + Disabled + ..\include;..\..\libftoa\include;..\..\..\Externals\UTF\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + + + Level3 + ProgramDatabase + + MaxSpeed @@ -1168,6 +1333,20 @@ + + + MaxSpeed + ..\include;..\..\libftoa\include;..\..\..\Externals\UTF\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + MultiThreadedDLL + false + + + Level3 + + + + MaxSpeed @@ -1248,6 +1427,23 @@ + + + X64 + + + MaxSpeed + ..\include;..\..\libftoa\include;..\..\..\Externals\UTF\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + MultiThreadedDLL + false + + + Level3 + + + + X64 @@ -1579,6 +1775,21 @@ EditAndContinue + + + Disabled + ..\include;..\..\libftoa\include;..\..\..\Externals\UTF\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + + + Level3 + EditAndContinue + + X64 @@ -1668,6 +1879,24 @@ ProgramDatabase + + + X64 + + + Disabled + ..\include;..\..\libftoa\include;..\..\..\Externals\UTF\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + + + Level3 + ProgramDatabase + + MaxSpeed @@ -1736,6 +1965,20 @@ + + + MaxSpeed + ..\include;..\..\libftoa\include;..\..\..\Externals\UTF\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + MultiThreaded + false + + + Level3 + + + + X64 @@ -1819,6 +2062,23 @@ + + + X64 + + + MaxSpeed + ..\include;..\..\libftoa\include;..\..\..\Externals\UTF\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + MultiThreaded + false + + + Level3 + + + + MaxSpeed @@ -1903,61 +2163,73 @@ true true true + true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc true true true true true + true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc true true true true true + true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc true true true true true + true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj @@ -1985,60 +2257,72 @@ true true true + true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc true true true true true + true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc true true true true + true true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc true true true true + true true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc @@ -2061,21 +2345,25 @@ true true true + true true true true true true + true true true true true true + true true true true true true + true true true true @@ -2087,20 +2375,24 @@ true true true + true true true true true true + true true true true true + true true true true true true + true true true true @@ -2115,21 +2407,25 @@ true true true + true true true true true true + true true true true true true + true true true true true true + true true true true @@ -2141,20 +2437,24 @@ true true true + true true true true true true + true true true true true + true true true true true true + true true true true diff --git a/common/libftoa/scripts/libftoa.vcxproj b/common/libftoa/scripts/libftoa.vcxproj index bef18013b..b17b023ab 100644 --- a/common/libftoa/scripts/libftoa.vcxproj +++ b/common/libftoa/scripts/libftoa.vcxproj @@ -97,6 +97,22 @@ Debug_lib x64 + + Debug_Max2018_static + Win32 + + + Debug_Max2018_static + x64 + + + Debug_Max2018 + Win32 + + + Debug_Max2018 + x64 + Debug_performanceTest Win32 @@ -209,6 +225,22 @@ Release_lib x64 + + Release_Max2018_static + Win32 + + + Release_Max2018_static + x64 + + + Release_Max2018 + Win32 + + + Release_Max2018 + x64 + Release_performanceTest Win32 @@ -268,6 +300,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v100 @@ -299,6 +337,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -356,6 +399,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v110 @@ -387,6 +436,11 @@ v110 Unicode + + StaticLibrary + v110 + Unicode + StaticLibrary v120 @@ -422,6 +476,12 @@ Unicode true + + StaticLibrary + v140 + Unicode + true + StaticLibrary v100 @@ -453,6 +513,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + StaticLibrary v120 @@ -510,6 +575,12 @@ Unicode true + + StaticLibrary + v110 + Unicode + true + StaticLibrary v140 @@ -541,6 +612,11 @@ v140 Unicode + + StaticLibrary + v140 + Unicode + @@ -562,6 +638,9 @@ + + + @@ -580,6 +659,9 @@ + + + @@ -610,6 +692,9 @@ + + + @@ -628,6 +713,9 @@ + + + @@ -646,6 +734,9 @@ + + + @@ -664,6 +755,9 @@ + + + @@ -694,6 +788,9 @@ + + + @@ -712,6 +809,9 @@ + + + <_ProjectFileVersion>12.0.30501.0 @@ -736,6 +836,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -756,6 +860,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -772,6 +880,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -792,6 +904,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -876,6 +992,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -896,6 +1016,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -912,6 +1036,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -932,6 +1060,10 @@ ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ + + ..\lib\win\$(Platform)\$(Configuration)\ + ..\obj\win\$(Platform)\$(Configuration)\ + ..\lib\win\$(Platform)\$(Configuration)\ ..\obj\win\$(Platform)\$(Configuration)\ @@ -1026,6 +1158,21 @@ EditAndContinue + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + + + Level3 + EditAndContinue + + X64 @@ -1115,6 +1262,24 @@ ProgramDatabase + + + X64 + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + + + Level3 + ProgramDatabase + + MaxSpeed @@ -1169,6 +1334,20 @@ + + + MaxSpeed + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + MultiThreadedDLL + false + + + Level3 + + + + MaxSpeed @@ -1249,6 +1428,23 @@ + + + X64 + + + MaxSpeed + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + MultiThreadedDLL + false + + + Level3 + + + + X64 @@ -1578,6 +1774,21 @@ EditAndContinue + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + + + Level3 + EditAndContinue + + X64 @@ -1667,6 +1878,24 @@ ProgramDatabase + + + X64 + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + + + Level3 + ProgramDatabase + + MaxSpeed @@ -1721,6 +1950,20 @@ + + + MaxSpeed + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + MultiThreaded + false + + + Level3 + + + + MaxSpeed @@ -1801,6 +2044,23 @@ + + + X64 + + + MaxSpeed + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF;%(PreprocessorDefinitions) + MultiThreaded + false + + + Level3 + + + + X64 @@ -1890,21 +2150,25 @@ true true true + true true true true true true + true true true true true true + true true true true true true + true true true true @@ -1915,21 +2179,25 @@ true true true + true true true true true true + true true true true true true + true true true true true true + true true true true @@ -1952,61 +2220,73 @@ true true true + true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc true true true true true + true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc true true true true true + true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc true true true true true + true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj @@ -2033,61 +2313,73 @@ true true true + true true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc true true true true + true true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc true true true true + true true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc true true true true + true true $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc @@ -2110,21 +2402,25 @@ true true true + true true true true true true + true true true true true true + true true true true true true + true true true true @@ -2135,21 +2431,25 @@ true true true + true true true true true true + true true true true true true + true true true true true true + true true true true @@ -2164,21 +2464,25 @@ true true true + true true true true true true + true true true true true true + true true true true true true + true true true true @@ -2189,21 +2493,25 @@ true true true + true true true true true true + true true true true true true + true true true true true true + true true true true @@ -2218,21 +2526,25 @@ true true true + true true true true true true + true true true true true true + true true true true true true + true true true true @@ -2243,21 +2555,25 @@ true true true + true true true true true true + true true true true true true + true true true true true true + true true true true @@ -2272,21 +2588,25 @@ true true true + true true true true true true + true true true true true true + true true true true true true + true true true true @@ -2297,21 +2617,25 @@ true true true + true true true true true true + true true true true true true + true true true true true true + true true true true @@ -2331,21 +2655,25 @@ true true true + true true true true true true + true true true true true true + true true true true true true + true true true true @@ -2356,21 +2684,25 @@ true true true + true true true true true true + true true true true true true + true true true true true true + true true true true From 32e356b47eba75eae724c4199d51ce89f143424b Mon Sep 17 00:00:00 2001 From: Remi Arnaud Date: Mon, 21 Aug 2017 23:25:42 -0700 Subject: [PATCH 02/10] add 2018 defines --- COLLADAMax/include/COLLADAMaxPrerequisites.h | 7 +++++++ COLLADAMax/include/COLLADAMaxStableHeaders.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/COLLADAMax/include/COLLADAMaxPrerequisites.h b/COLLADAMax/include/COLLADAMaxPrerequisites.h index e480f7434..08f269cdf 100644 --- a/COLLADAMax/include/COLLADAMaxPrerequisites.h +++ b/COLLADAMax/include/COLLADAMaxPrerequisites.h @@ -119,6 +119,13 @@ # define MAX_2017 #endif +#if ( MAX_VERSION_MAJOR >= 20 ) +# define MAX_2018_OR_NEWER +#endif +#if ( MAX_VERSION_MAJOR == 20 ) +# define MAX_2018 +#endif + // Max 2009 requires RTTI to be enabled #ifdef MAX_2009_OR_NEWER #ifndef _CPPRTTI diff --git a/COLLADAMax/include/COLLADAMaxStableHeaders.h b/COLLADAMax/include/COLLADAMaxStableHeaders.h index 155ccbc3c..e233e5942 100644 --- a/COLLADAMax/include/COLLADAMaxStableHeaders.h +++ b/COLLADAMax/include/COLLADAMaxStableHeaders.h @@ -48,6 +48,8 @@ # pragma message ("Compiling for Max2016") #elif defined MAX_2017 # pragma message ("Compiling for Max2017") +#elif defined MAX_2018 +# pragma message ("Compiling for Max2018") #else # error( "Unsupported Max version" ) #endif From 371d7bd71aee9d2841c5f347d284449ac14d697b Mon Sep 17 00:00:00 2001 From: Remi Arnaud Date: Wed, 23 Aug 2017 12:09:48 -0700 Subject: [PATCH 03/10] fix max 2018 build --- COLLADAMax/src/COLLADAMaxGeometryExtra.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/COLLADAMax/src/COLLADAMaxGeometryExtra.cpp b/COLLADAMax/src/COLLADAMaxGeometryExtra.cpp index c578434cc..7254ec8e2 100644 --- a/COLLADAMax/src/COLLADAMaxGeometryExtra.cpp +++ b/COLLADAMax/src/COLLADAMaxGeometryExtra.cpp @@ -549,7 +549,11 @@ namespace COLLADAMax //--------------------------------------------------------------- void GeometryExtra::exportParamBlock2 ( const String & elementName, const ExtraParameter extraParameters[], int extraParametersCount ) { - IParamBlock2 * paramBlock = ( ( SimpleObject2 * ) mObject ) ->pblock2; +#ifdef MAX_2018_OR_NEWER + IParamBlock2 * paramBlock = ( ( SimpleObject2 * ) mObject ) ->GetParamBlock(0); +#else + IParamBlock2 * paramBlock = ((SimpleObject2 *)mObject)->pblock2; +#endif addParamBlockAnimatedExtraParameters(elementName, extraParameters, extraParametersCount, paramBlock, mGeometryId); } From 7dbbde42c7632067a5dc781d0c682ad167ff1776 Mon Sep 17 00:00:00 2001 From: Remi Arnaud Date: Wed, 23 Aug 2017 15:03:27 -0700 Subject: [PATCH 04/10] updated build instructions for 2015/2017/2018 --- COLLADAMax/BUILD | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/COLLADAMax/BUILD b/COLLADAMax/BUILD index ba8cbcb6e..d08b4a755 100644 --- a/COLLADAMax/BUILD +++ b/COLLADAMax/BUILD @@ -4,12 +4,14 @@ Requirements: - Autodesk 3ds Max To build the COLLADAMax plug-in you need to have a version of 3ds Max, including the SDK, installed. Supported versions are: - 3ds Max 2011, 2012, 2013, 2014, 2015 + 3ds Max 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 -- MS Visual Studio 2013 for loading the solution (should work with 2012) +- MS Visual Studio 2015 for loading the solution MS Visual Studio 2008 to compile for Max 2011/2012 MS Visual Studio 2010 to compile for Max 2013/2014 - MS Visual Studio 2012 to compile for Max 2015 + MS Visual Studio 2012 to compile for Max 2015/2016 + MS Visual Studio 2015 to compile for Max 2017 + MS Visual Studio 2015 update 3 with Windows SDK 10.0.10586 for Max 2018 IMPORTANT : DO NOT let visual studio convert the project files if it ask to when loading the solution. It is normal that the solution references different toolchains. From 003d0833eab7d4c3f70994aa75d702e0579630f8 Mon Sep 17 00:00:00 2001 From: Remi Arnaud Date: Wed, 23 Aug 2017 15:46:08 -0700 Subject: [PATCH 05/10] fixed solution to build 2018 --- COLLADAMax/COLLADAMax.sln | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/COLLADAMax/COLLADAMax.sln b/COLLADAMax/COLLADAMax.sln index 53dcfa06f..b21614e22 100644 --- a/COLLADAMax/COLLADAMax.sln +++ b/COLLADAMax/COLLADAMax.sln @@ -711,8 +711,8 @@ Global {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2017|x64.Build.0 = Release_LibXML_v140|x64 {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018_static|Win32.ActiveCfg = Release_Max2018_static|Win32 {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018_static|Win32.Build.0 = Release_Max2018_static|Win32 - {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018_static|x64.ActiveCfg = Debug_LibXML_NoValidation_static_v140|x64 - {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018_static|x64.Build.0 = Debug_LibXML_NoValidation_static_v140|x64 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018_static|x64.ActiveCfg = Release_LibXML_NoValidation_static_v140|x64 + {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018_static|x64.Build.0 = Release_LibXML_NoValidation_static_v140|x64 {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018|x64.ActiveCfg = Release_LibXML_v140|x64 {8628A8F8-BD50-4463-9EE7-F9118CBA194A}.Release_Max2018|x64.Build.0 = Release_LibXML_v140|x64 @@ -835,8 +835,8 @@ Global {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2018_static|x64.ActiveCfg = Release_LibXML_static_v140|x64 {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2018_static|x64.Build.0 = Release_LibXML_static_v140|x64 {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2018|Win32.ActiveCfg = Release_Max2018|Win32 - {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2018|x64.ActiveCfg = Debug_LibXML_v140|x64 - {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2018|x64.Build.0 = Debug_LibXML_v140|x64 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2018|x64.ActiveCfg = Release_LibXML_v140|x64 + {0B6C3FEA-0065-44D2-A69A-28F810A4F2AF}.Release_Max2018|x64.Build.0 = Release_LibXML_v140|x64 {D7F466F4-2AEA-4648-BE09-024C887BC157}.Debug_Max2011_static|Win32.ActiveCfg = Debug_static_v90|Win32 {D7F466F4-2AEA-4648-BE09-024C887BC157}.Debug_Max2011_static|Win32.Build.0 = Debug_static_v90|Win32 {D7F466F4-2AEA-4648-BE09-024C887BC157}.Debug_Max2011_static|x64.ActiveCfg = Debug_static_v90|x64 From d91ddfdc2b77537595c6d98c39b233317c454a8d Mon Sep 17 00:00:00 2001 From: UfoXp Date: Thu, 24 Aug 2017 17:51:07 +0100 Subject: [PATCH 06/10] Post build step in COLLADAMax for 3DS MAX 2018 has been fixed. --- COLLADAMax/scripts/COLLADAMax.vcxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/COLLADAMax/scripts/COLLADAMax.vcxproj b/COLLADAMax/scripts/COLLADAMax.vcxproj index e0424f3c2..a044d9ed3 100644 --- a/COLLADAMax/scripts/COLLADAMax.vcxproj +++ b/COLLADAMax/scripts/COLLADAMax.vcxproj @@ -2440,7 +2440,7 @@ MachineX64 - copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2017)plugins\ColladaMaxNew.dle" + copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2018)plugins\ColladaMaxNew.dle" @@ -2949,7 +2949,7 @@ MachineX64 - copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2017)plugins\ColladaMaxNew.dle" + copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2018)plugins\ColladaMaxNew.dle" @@ -3580,7 +3580,7 @@ MachineX64 - copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2017)plugins\ColladaMaxNew.dle" + copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2018)plugins\ColladaMaxNew.dle" @@ -4129,7 +4129,7 @@ MachineX64 - copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2017)plugins\ColladaMaxNew.dle" + copy "$(OutDir)COLLADAMaxNew.dle" "$(ADSK_3DSMAX_x64_2018)plugins\ColladaMaxNew.dle" From 264a48c739da2144fe89cea8a015ebc75eaf02e3 Mon Sep 17 00:00:00 2001 From: UfoXp Date: Thu, 24 Aug 2017 18:44:23 +0100 Subject: [PATCH 07/10] 3DS MAX exporter dialog construction fix 1. Dialog class pointer is no longer truncated. 2. A bit of style uniformisation has been done. --- COLLADAMax/src/COLLADAMaxGeometryExporter.cpp | 1 - COLLADAMax/src/COLLADAMaxGeometryExtra.cpp | 2 +- COLLADAMax/src/COLLADAMaxOptions.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/COLLADAMax/src/COLLADAMaxGeometryExporter.cpp b/COLLADAMax/src/COLLADAMaxGeometryExporter.cpp index cf1743769..4bae92dff 100644 --- a/COLLADAMax/src/COLLADAMaxGeometryExporter.cpp +++ b/COLLADAMax/src/COLLADAMaxGeometryExporter.cpp @@ -317,7 +317,6 @@ namespace COLLADAMax //--------------------------------------------------------------- void GeometryExporter::doExportMesh() { - if( !mMorphControllerHelperGeometry && !(mExportNode->getIsInVisualScene() || mExportNode->getIsReferenced()) ) return; diff --git a/COLLADAMax/src/COLLADAMaxGeometryExtra.cpp b/COLLADAMax/src/COLLADAMaxGeometryExtra.cpp index 7254ec8e2..40d88d040 100644 --- a/COLLADAMax/src/COLLADAMaxGeometryExtra.cpp +++ b/COLLADAMax/src/COLLADAMaxGeometryExtra.cpp @@ -552,7 +552,7 @@ namespace COLLADAMax #ifdef MAX_2018_OR_NEWER IParamBlock2 * paramBlock = ( ( SimpleObject2 * ) mObject ) ->GetParamBlock(0); #else - IParamBlock2 * paramBlock = ((SimpleObject2 *)mObject)->pblock2; + IParamBlock2 * paramBlock = ( ( SimpleObject2 * ) mObject ) ->pblock2; #endif addParamBlockAnimatedExtraParameters(elementName, extraParameters, extraParametersCount, paramBlock, mGeometryId); } diff --git a/COLLADAMax/src/COLLADAMaxOptions.cpp b/COLLADAMax/src/COLLADAMaxOptions.cpp index cfcb07290..366048a6a 100644 --- a/COLLADAMax/src/COLLADAMaxOptions.cpp +++ b/COLLADAMax/src/COLLADAMaxOptions.cpp @@ -288,7 +288,7 @@ namespace COLLADAMax { // record exp instance pointer for subsequent callbacks exp = (Options*) lParam; - SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG)lParam); + SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)lParam); } else { From f3c0b035019d77cfa1d8ad5ec5e41a140c1fb228 Mon Sep 17 00:00:00 2001 From: UfoXp Date: Sat, 26 Aug 2017 07:59:54 +0100 Subject: [PATCH 08/10] Geometry extra export no longer crashes 3DS MAX 2018. 1. exportParamBlock on 3DS MAX 2018 is now same as exportParamBlock2. 2. Warnings about duplicated class IDs got fixed. 3. Some comments got added. 4. Tabs have been replaced with spaces in few places in COLLADAMax/src/COLLADAMaxGeometryExtra.cpp. --- COLLADAMax/src/COLLADAMaxGeometryExtra.cpp | 45 +++++++++++++--------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/COLLADAMax/src/COLLADAMaxGeometryExtra.cpp b/COLLADAMax/src/COLLADAMaxGeometryExtra.cpp index 40d88d040..7d71feebd 100644 --- a/COLLADAMax/src/COLLADAMaxGeometryExtra.cpp +++ b/COLLADAMax/src/COLLADAMaxGeometryExtra.cpp @@ -6,10 +6,10 @@ Portions of the code are: Copyright (c) 2005-2007 Feeling Software Inc. Copyright (c) 2005-2007 Sony Computer Entertainment America - + Based on the 3dsMax COLLADASW Tools: Copyright (c) 2005-2006 Autodesk Media Entertainment - + Licensed under the MIT Open Source License, for details please see LICENSE file or the website http://www.opensource.org/licenses/mit-license.php @@ -24,15 +24,19 @@ #include // class ids of the non standard primitives -#define CHAMFERBOX_CLASS_ID Class_ID( 0x1AD73F40,0x48EA0F97 ) + +#ifndef MAX_2018_OR_NEWER + #define CHAMFERBOX_CLASS_ID Class_ID( 0x1AD73F40,0x48EA0F97 ) + #define PRISM_CLASS_ID Class_ID( 0x63705FAC,0x5C1F553F ) + #define CHAMFERCYL_CLASS_ID Class_ID( 0x7B9A546E,0x21A446A1 ) + #define CAPSULE_CLASS_ID Class_ID( 0x6D3D77AC,0x79C939A9 ) +#endif + #define OILTANK_CLASS_ID Class_ID( 0x210E642A,0x22F11EF8 ) #define SPINDLE_CLASS_ID Class_ID( 0x130B141B,0x04B35AFE ) #define GENGON_CLASS_ID Class_ID( 0x49BF599F,0x35F945AB ) #define RINGWAVE_CLASS_ID Class_ID( 0x28E41F64,0x124B5312 ) -#define PRISM_CLASS_ID Class_ID( 0x63705FAC,0x5C1F553F ) #define TORUSKNOT_CLASS_ID Class_ID( 0x00000720,0x00000000 ) -#define CHAMFERCYL_CLASS_ID Class_ID( 0x7B9A546E,0x21A446A1 ) -#define CAPSULE_CLASS_ID Class_ID( 0x6D3D77AC,0x79C939A9 ) #define L_EXT_CLASS_ID Class_ID( 0x09E73A08,0x08693067 ) #define C_EXT_CLASS_ID Class_ID( 0x33B1284D,0x7AF0200D ) #define HOSE_CLASS_ID Class_ID( 0x69F96A5D,0x235C430A ) @@ -41,14 +45,8 @@ #define SPIRALSTAIR_CLASS_ID Class_ID( 0x589D2C12,0x3D713EC9 ) #define UTYPESTAIR_CLASS_ID Class_ID( 0x5D56671C,0x20264CEB ) - - namespace COLLADAMax { - - - - const String GeometryExtra::ELEMENT_BOX = "max_box"; const String GeometryExtra::ELEMENT_SPHERE = "max_sphere"; const String GeometryExtra::ELEMENT_CYLINDER = "max_cylinder"; @@ -388,9 +386,9 @@ namespace COLLADAMax //--------------------------------------------------------------- GeometryExtra::GeometryExtra ( COLLADASW::StreamWriter * streamWriter, DocumentExporter * documentExporter, Object * object, const String& geometryId ) : Extra ( streamWriter, documentExporter), - mStreamWriter(streamWriter), + mStreamWriter(streamWriter), mObject ( object ), - mGeometryId(geometryId) + mGeometryId(geometryId) {} //--------------------------------------------------------------- @@ -398,8 +396,10 @@ namespace COLLADAMax { Class_ID id = mObject->ClassID(); - setExtraTechnique(this); + setExtraTechnique(this); + //TODO: At least on 3DS MAX 2018 many parameters are no longer exported + // e.g. radiuses on cone if ( id == Class_ID ( BOXOBJ_CLASS_ID, 0 ) ) exportParamBlock ( ELEMENT_BOX, BOXPARAMETERS, BOXPARAMETERSCOUNT ); else if ( id == Class_ID ( SPHERE_CLASS_ID, 0 ) ) @@ -409,6 +409,8 @@ namespace COLLADAMax else if ( id == Class_ID ( TORUS_CLASS_ID, 0 ) ) exportParamBlock ( ELEMENT_TORUS, TORUSPARAMETERS, TORUSPARAMETERSCOUNT ); else if ( id == Class_ID ( TEAPOT_CLASS_ID1, TEAPOT_CLASS_ID2 ) ) + // Note that teapot class ID consists of two parts - ID1 & ID2. + // Thats one long ID... exportParamBlock ( ELEMENT_TEAPOT, TEAPOTPARAMETERS, TEAPOTPARAMETERSCOUNT ); else if ( id == Class_ID ( CONE_CLASS_ID, 0 ) ) exportParamBlock ( ELEMENT_CONE, CONEPARAMETERS, CONEPARAMETERSCOUNT ); @@ -535,15 +537,22 @@ namespace COLLADAMax fb.close(); #endif - addExtraTechniques(mStreamWriter); + addExtraTechniques(mStreamWriter); } //--------------------------------------------------------------- void GeometryExtra::exportParamBlock ( const String & elementName, const ExtraParameter extraParameters[], int extraParametersCount ) { +#ifdef MAX_2018_OR_NEWER + // For some reason on 3DS MAX 2018 all info required for extras is in + // same block. Separate methods are still required for older 3DS MAXes. + exportParamBlock2(elementName, extraParameters, extraParametersCount); + return; +#else IParamBlock * paramBlock = mObject->GetParamBlock() ->GetParamBlock(); - addParamBlockAnimatedExtraParameters(elementName, extraParameters, extraParametersCount, paramBlock, mGeometryId); + addParamBlockAnimatedExtraParameters(elementName, extraParameters, extraParametersCount, paramBlock, mGeometryId); +#endif } //--------------------------------------------------------------- @@ -554,7 +563,7 @@ namespace COLLADAMax #else IParamBlock2 * paramBlock = ( ( SimpleObject2 * ) mObject ) ->pblock2; #endif - addParamBlockAnimatedExtraParameters(elementName, extraParameters, extraParametersCount, paramBlock, mGeometryId); + addParamBlockAnimatedExtraParameters(elementName, extraParameters, extraParametersCount, paramBlock, mGeometryId); } } From 22d1becf33d78f50dda30dc27ed98f9d7a3664a1 Mon Sep 17 00:00:00 2001 From: UfoXp Date: Sat, 26 Aug 2017 09:17:20 +0100 Subject: [PATCH 09/10] Google Warehouse GUP load no longe crashes 3DS MAX 2018. 1. Google Warehouse menu item insert index has been changed. 2. TODO comment has been added. --- COLLADAMax/src/COLLADAMaxGoogleWarehouse.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/COLLADAMax/src/COLLADAMaxGoogleWarehouse.cpp b/COLLADAMax/src/COLLADAMaxGoogleWarehouse.cpp index 8ddeda509..9f8a2c13a 100644 --- a/COLLADAMax/src/COLLADAMaxGoogleWarehouse.cpp +++ b/COLLADAMax/src/COLLADAMaxGoogleWarehouse.cpp @@ -34,7 +34,6 @@ namespace COLLADAMax , mFileMenu(mMenuManager ? mMenuManager->GetMainMenuBar()->GetItem(0)->GetSubMenu() : 0) , mWarehouseItem(0) { - } const ActionTableId googleWarehouseTableActions = 0x7ff73cb5; @@ -51,7 +50,6 @@ namespace COLLADAMax //------------------------------ DWORD GoogleWarehouse::Start() { - if ( !mWarehouseItem ) { mWarehouseItem= GetIMenuItem(); @@ -90,8 +88,17 @@ namespace COLLADAMax mWarehouseItem->SetVisible( true ); mWarehouseItem->SetEnabled( true ); - // add warehouse item before import + // Add warehouse item before import, note that changing order of menu + // items after menu has been edited at least once requires removal of + // Workspace*.mnux from UI\Workspaces and UI\Workspaces\usersave to see + // the changes. + //TODO: Inserting at hardcoded index is fragile. Code should instead + // search for menu item (by ID) over which to insert. +#ifdef MAX_2018_OR_NEWER + mFileMenu->AddItem(mWarehouseItem, 12); +#else mFileMenu->AddItem(mWarehouseItem, 29); +#endif mMenuManager->RegisterMenu(mFileMenu, 0); From 33a7e00914b98cadcbaf48533666cbe677756eb7 Mon Sep 17 00:00:00 2001 From: UfoXp Date: Sat, 26 Aug 2017 09:32:53 +0100 Subject: [PATCH 10/10] .gitattributes has been added so that people without core.autocrlf set could still edit *.vcxproj in a human manner. --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..8735ff333 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# This is so people without core.autocrlf set could work properly with project files. +*.vcxproj text eol=crlf