Removed direct STL dependency from the Assimp interface, should hopefully avoid problems with binary incompatible STLs. Some API changes, e.g. in the logger.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@321 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2009-01-23 21:06:43 +00:00
parent b5ab82922d
commit 03fcec7fe3
26 changed files with 542 additions and 289 deletions

View File

@@ -23,7 +23,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
>
<Tool
@@ -105,7 +105,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
>
<Tool
@@ -188,7 +188,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -268,7 +268,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -349,7 +349,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -429,7 +429,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -510,7 +510,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
>
<Tool
@@ -592,7 +592,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
>
<Tool
@@ -675,7 +675,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\NoBoostShared.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -755,7 +755,7 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\NoBoostShared.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -836,7 +836,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\NoBoostShared.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
>
<Tool
@@ -918,7 +918,7 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\NoBoostShared.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
>
<Tool
@@ -1001,7 +1001,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\SingleThreadedShared.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
>
<Tool
@@ -1083,7 +1083,7 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\SingleThreadedShared.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
>
<Tool
@@ -1166,7 +1166,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\SingleThreadedShared.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -1246,7 +1246,7 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\SingleThreadedShared.vsprops"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>

View File

@@ -20,7 +20,7 @@
<Configuration
Name="debug|Win32"
ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\FastSTL.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -85,6 +85,7 @@
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -145,7 +146,7 @@
<Configuration
Name="release|Win32"
ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\FastSTL.vsprops"
WholeProgramOptimization="0"
>
<Tool
@@ -211,7 +212,7 @@
<Configuration
Name="release|x64"
ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\FastSTL.vsprops"
WholeProgramOptimization="0"
>
<Tool
@@ -276,7 +277,7 @@
<Configuration
Name="release-dll|Win32"
ConfigurationType="2"
InheritedPropertySheets=".\shared\DllShared.vsprops"
InheritedPropertySheets=".\shared\DllShared.vsprops;.\shared\FastSTL.vsprops"
WholeProgramOptimization="0"
>
<Tool
@@ -353,7 +354,7 @@
<Configuration
Name="release-dll|x64"
ConfigurationType="2"
InheritedPropertySheets=".\shared\DllShared.vsprops"
InheritedPropertySheets=".\shared\DllShared.vsprops;.\shared\FastSTL.vsprops"
WholeProgramOptimization="0"
>
<Tool
@@ -429,7 +430,7 @@
<Configuration
Name="debug-dll|Win32"
ConfigurationType="2"
InheritedPropertySheets=".\shared\DllShared.vsprops"
InheritedPropertySheets=".\shared\DllShared.vsprops;.\shared\FastSTL.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -504,7 +505,7 @@
<Configuration
Name="debug-dll|x64"
ConfigurationType="2"
InheritedPropertySheets=".\shared\DllShared.vsprops"
InheritedPropertySheets=".\shared\DllShared.vsprops;.\shared\FastSTL.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -578,7 +579,7 @@
<Configuration
Name="release-noboost-st|Win32"
ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
WholeProgramOptimization="0"
>
<Tool
@@ -643,7 +644,7 @@
<Configuration
Name="release-noboost-st|x64"
ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
WholeProgramOptimization="0"
>
<Tool
@@ -708,7 +709,7 @@
<Configuration
Name="debug-noboost-st|Win32"
ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -771,7 +772,7 @@
<Configuration
Name="debug-noboost-st|x64"
ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -832,7 +833,7 @@
<Configuration
Name="debug-st|Win32"
ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -895,7 +896,7 @@
<Configuration
Name="debug-st|x64"
ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -956,7 +957,7 @@
<Configuration
Name="release-st|Win32"
ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
WholeProgramOptimization="0"
>
<Tool
@@ -1021,7 +1022,7 @@
<Configuration
Name="release-st|x64"
ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
WholeProgramOptimization="0"
>
<Tool

View File

@@ -23,6 +23,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2"
>
<Tool
@@ -104,6 +105,7 @@
OutputDirectory="$(SolutionDir)..\..\tools\build\$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="$(SolutionDir)..\..\tools\build\$(ConfigurationName)_$(PlatformName)\obj"
ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2"
>
<Tool
@@ -186,6 +188,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
@@ -267,6 +270,7 @@
OutputDirectory="$(SolutionDir)..\..\tools\build\$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="$(SolutionDir)..\..\tools\build\$(ConfigurationName)_$(PlatformName)\obj"
ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
@@ -349,6 +353,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
@@ -430,6 +435,7 @@
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
@@ -512,6 +518,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2"
>
<Tool
@@ -593,6 +600,7 @@
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2"
>
<Tool
@@ -675,7 +683,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\NoBoostShared.vsprops"
InheritedPropertySheets=".\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
@@ -757,7 +765,7 @@
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\NoBoostShared.vsprops"
InheritedPropertySheets=".\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
@@ -840,7 +848,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\NoBoostShared.vsprops"
InheritedPropertySheets=".\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="2"
>
<Tool
@@ -922,7 +930,7 @@
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\NoBoostShared.vsprops"
InheritedPropertySheets=".\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="2"
>
<Tool
@@ -1005,6 +1013,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2"
>
<Tool
@@ -1086,6 +1095,7 @@
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2"
>
<Tool
@@ -1168,6 +1178,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
@@ -1249,6 +1260,7 @@
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="FastSTL"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0"
/>
</VisualStudioPropertySheet>

View File

@@ -186,7 +186,6 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>