diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/collada-dom-v2.3-r8.patch | 110 |
1 files changed, 0 insertions, 110 deletions
diff --git a/patches/collada-dom-v2.3-r8.patch b/patches/collada-dom-v2.3-r8.patch index c72c014340..b24ae2746b 100644 --- a/patches/collada-dom-v2.3-r8.patch +++ b/patches/collada-dom-v2.3-r8.patch @@ -389,116 +389,6 @@ index 15b1e6a..023814d 100644 $(obj): includeOpts := $(includeOpts) # Call createObjRule with a source file path -diff --git a/projects/vc142-1.4/dom-static.vcxproj b/projects/vc142-1.4/dom-static.vcxproj -index 555ca4c..b87c231 100644 ---- a/projects/vc142-1.4/dom-static.vcxproj -+++ b/projects/vc142-1.4/dom-static.vcxproj -@@ -122,13 +122,11 @@ - <AdditionalIncludeDirectories>..\..\include;..\..\include\1.4;..\..\stage\packages\include;..\..\stage\packages\include\libxml2;..\..\stage\packages\include\minizip-ng;..\..\stage\packages\include\zlib-ng;..\..\external-libs\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> -- <DisableLanguageExtensions>false</DisableLanguageExtensions> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>OldStyle</DebugInformationFormat> -- <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> -- <LanguageStandard>stdcpp17</LanguageStandard> -+ <LanguageStandard>stdcpp20</LanguageStandard> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - </ClCompile> - <Lib> -@@ -143,13 +141,11 @@ - <AdditionalIncludeDirectories>..\..\include;..\..\include\1.4;..\..\stage\packages\include;..\..\stage\packages\include\libxml2;..\..\stage\packages\include\minizip-ng;..\..\stage\packages\include\zlib-ng;..\..\external-libs\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> -- <DisableLanguageExtensions>false</DisableLanguageExtensions> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>OldStyle</DebugInformationFormat> -- <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> -- <LanguageStandard>stdcpp17</LanguageStandard> -+ <LanguageStandard>stdcpp20</LanguageStandard> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - </ClCompile> - <Lib> -diff --git a/projects/vc142-1.4/dom.vcxproj b/projects/vc142-1.4/dom.vcxproj -index 04b0a11..0c57fd4 100644 ---- a/projects/vc142-1.4/dom.vcxproj -+++ b/projects/vc142-1.4/dom.vcxproj -@@ -149,15 +149,14 @@ - <ClCompile> - <AdditionalIncludeDirectories>..\..\include;..\..\include\1.4;..\..\stage\packages\include;..\..\stage\packages\include\libxml2;..\..\stage\packages\include\minizip-ng;..\..\stage\packages\include\zlib-ng;..\..\external-libs\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -- <DisableLanguageExtensions>false</DisableLanguageExtensions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;DOM_EXPORT;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <WholeProgramOptimization>true</WholeProgramOptimization> -- <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> - <MultiProcessorCompilation>true</MultiProcessorCompilation> -+ <LanguageStandard>stdcpp20</LanguageStandard> - </ClCompile> - <Link> - <AdditionalDependencies>libxml2.lib;Bcrypt.lib;zlib.lib;wsock32.lib;minizip.lib;libboost_regex-mt-x32.lib;libboost_filesystem-mt-x32.lib;libboost_system-mt-x32.lib;%(AdditionalDependencies)</AdditionalDependencies> -@@ -180,15 +179,14 @@ - <ClCompile> - <AdditionalIncludeDirectories>..\..\include;..\..\include\1.4;..\..\stage\packages\include;..\..\stage\packages\include\libxml2;..\..\stage\packages\include\minizip-ng;..\..\stage\packages\include\zlib-ng;..\..\external-libs\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -- <DisableLanguageExtensions>false</DisableLanguageExtensions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;DOM_EXPORT;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <WholeProgramOptimization>true</WholeProgramOptimization> -- <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> - <MultiProcessorCompilation>true</MultiProcessorCompilation> -+ <LanguageStandard>stdcpp20</LanguageStandard> - </ClCompile> - <Link> - <AdditionalDependencies>libxml2.lib;Bcrypt.lib;zlib.lib;wsock32.lib;minizip.lib;libboost_regex-mt-x64.lib;libboost_filesystem-mt-x64.lib;libboost_system-mt-x64.lib;%(AdditionalDependencies)</AdditionalDependencies> -diff --git a/projects/vc142-1.4/domTest.vcxproj b/projects/vc142-1.4/domTest.vcxproj -index 5daeaa3..362ca6f 100644 ---- a/projects/vc142-1.4/domTest.vcxproj -+++ b/projects/vc142-1.4/domTest.vcxproj -@@ -133,15 +133,14 @@ - <ClCompile> - <AdditionalIncludeDirectories>..\..\include;..\..\include\1.4;..\..\stage\packages\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -- <DisableLanguageExtensions>false</DisableLanguageExtensions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <WholeProgramOptimization>true</WholeProgramOptimization> -- <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> - <MultiProcessorCompilation>true</MultiProcessorCompilation> -+ <LanguageStandard>stdcpp20</LanguageStandard> - </ClCompile> - <Link> - <AdditionalDependencies>libcollada14dom23.lib;libboost_filesystem-mt-x32.lib;libboost_system-mt-x32.lib;%(AdditionalDependencies)</AdditionalDependencies> -@@ -161,15 +160,14 @@ - <ClCompile> - <AdditionalIncludeDirectories>..\..\include;..\..\include\1.4;..\..\stage\packages\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -- <DisableLanguageExtensions>false</DisableLanguageExtensions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <WholeProgramOptimization>true</WholeProgramOptimization> -- <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> - <MultiProcessorCompilation>true</MultiProcessorCompilation> -+ <LanguageStandard>stdcpp20</LanguageStandard> - </ClCompile> - <Link> - <AdditionalDependencies>libcollada14dom23.lib;libboost_filesystem-mt-x64.lib;libboost_system-mt-x64.lib;%(AdditionalDependencies)</AdditionalDependencies> diff --git a/src/1.4/CMakeLists.txt b/src/1.4/CMakeLists.txt index 17fbaea..d0d5939 100644 --- a/src/1.4/CMakeLists.txt |