v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enabled 'fast' STL for vc9. secure_stl=0 && iterator_debugging=0. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@318 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2009-01-21 21:33:56 +00:00
parent 030d982cfa
commit 7dabd7cd72
7 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/AssimpPCH.h
View File

@ -61,23 +61,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# define AI_DEBUG_INVALIDATE_PTR(x) # define AI_DEBUG_INVALIDATE_PTR(x)
#endif #endif
// We depend heavily on the STL's performance, so we need to make sure
// that the M$ implementation isn't 'secure', but 'fast'
#if 0 // this crashes! what the fuck???
#if (defined _MSC_VER) && (!defined DEBUG)
# define _SECURE_SCL 0
# define _SCL_SECURE_NO_DEPRECATE
# define _HAS_ITERATOR_DEBUGGING 0
#endif
#endif
// If we have at least VC8 some C string manipulation functions // If we have at least VC8 some C string manipulation functions
// are mapped to their safe _s counterparts (e.g. _itoa_s). // are mapped to their safe _s counterparts (e.g. _itoa_s).
#if _MSC_VER >= 1400 && !(defined _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES) #if _MSC_VER >= 1400 && !(defined _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES)
# define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1 # define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
#endif #endif
// Actually that'snot required for MSVC (it is included somewhere in // Actually that's not required for MSVC (it is included somewhere in
// the STL ..) but it is necessary for build with STLport. // the STL ..) but it is necessary for build with STLport.
#include <ctype.h> #include <ctype.h>

12
contrib/cppunit-1.12.1/src/cppunit/cppunitvc9.vcproj
View File

@ -23,7 +23,7 @@
OutputDirectory=".\Debug" OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug" IntermediateDirectory=".\Debug"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\..\..\..\workspaces\vc9\shared\FastSTL.vsprops"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2" CharacterSet="2"
@ -101,7 +101,7 @@
OutputDirectory=".\Release" OutputDirectory=".\Release"
IntermediateDirectory=".\Release" IntermediateDirectory=".\Release"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\..\..\..\workspaces\vc9\shared\FastSTL.vsprops"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2" CharacterSet="2"
@ -654,11 +654,11 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\include\cppunit\TextTestRunner.h" RelativePath="..\..\include\cppunit\ui\text\TextTestRunner.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\cppunit\ui\text\TextTestRunner.h" RelativePath="..\..\include\cppunit\TextTestRunner.h"
> >
</File> </File>
</Filter> </Filter>
@ -2695,11 +2695,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\include\cppunit\Makefile.am" RelativePath="Makefile.am"
> >
</File> </File>
<File <File
RelativePath="Makefile.am" RelativePath="..\..\include\cppunit\Makefile.am"
> >
</File> </File>
</Files> </Files>

8
test/unit/UnitTestPCH.h
View File

@ -4,12 +4,8 @@
// # include <boost/thread.hpp> // # include <boost/thread.hpp>
// #endif // #endif
// Assimp public API // We need to be sure to have the same STL settings as Assimp
#include <aiPostProcess.h> #include <AssimpPCH.h>
#include <aiScene.h>
#include <assimp.hpp>
#include <DefaultLogger.h>
// CPPUNIT // CPPUNIT
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>

18
workspaces/vc9/UnitTest.vcproj
View File

@ -24,7 +24,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops" InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1" CharacterSet="1"
> >
<Tool <Tool
@ -105,7 +105,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops" InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
@ -127,7 +127,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\code;..\..\include" AdditionalIncludeDirectories="..\..\code;..\..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
PrecompiledHeaderThrough="UnitTestPCH.h" PrecompiledHeaderThrough="UnitTestPCH.h"
@ -184,7 +184,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops" InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
@ -263,7 +263,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops" InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1" CharacterSet="1"
> >
<Tool <Tool
@ -344,7 +344,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\NoBoostShared.vsprops" InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
@ -423,7 +423,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\NoBoostShared.vsprops" InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1" CharacterSet="1"
> >
<Tool <Tool
@ -504,7 +504,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\SingleThreadedShared.vsprops" InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1" CharacterSet="1"
> >
<Tool <Tool
@ -585,7 +585,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\SingleThreadedShared.vsprops" InheritedPropertySheets=".\shared\UnitTest.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >

19
workspaces/vc9/assimp.vcproj
View File

@ -21,7 +21,7 @@
<Configuration <Configuration
Name="debug|Win32" Name="debug|Win32"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops" InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\FastSTL.vsprops"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
@ -83,8 +83,9 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="release|Win32" Name="release|Win32"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops" InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\FastSTL.vsprops"
WholeProgramOptimization="0" WholeProgramOptimization="0"
> >
<Tool <Tool
@ -109,7 +110,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories=""
PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32" PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_SECURE_SCL=0;WIN32"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
BufferSecurityCheck="false" BufferSecurityCheck="false"
@ -150,7 +151,7 @@
<Configuration <Configuration
Name="release-dll|Win32" Name="release-dll|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\shared\DllShared.vsprops" InheritedPropertySheets=".\shared\DllShared.vsprops;.\shared\FastSTL.vsprops"
WholeProgramOptimization="0" WholeProgramOptimization="0"
> >
<Tool <Tool
@ -226,7 +227,7 @@
<Configuration <Configuration
Name="debug-dll|Win32" Name="debug-dll|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\shared\DllShared.vsprops" InheritedPropertySheets=".\shared\DllShared.vsprops;.\shared\FastSTL.vsprops"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
@ -300,7 +301,7 @@
<Configuration <Configuration
Name="release-noboost-st|Win32" Name="release-noboost-st|Win32"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops" InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
WholeProgramOptimization="0" WholeProgramOptimization="0"
> >
<Tool <Tool
@ -365,7 +366,7 @@
<Configuration <Configuration
Name="debug-noboost-st|Win32" Name="debug-noboost-st|Win32"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops" InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
@ -428,7 +429,7 @@
<Configuration <Configuration
Name="debug-st|Win32" Name="debug-st|Win32"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops" InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
@ -491,7 +492,7 @@
<Configuration <Configuration
Name="release-st|Win32" Name="release-st|Win32"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops" InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
WholeProgramOptimization="0" WholeProgramOptimization="0"
> >
<Tool <Tool

12
workspaces/vc9/assimp_view.vcproj
View File

@ -24,6 +24,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
@ -104,6 +105,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
@ -125,7 +127,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(DXSDK_DIR)include&quot;;..\..\include;..\..\code" AdditionalIncludeDirectories="&quot;$(DXSDK_DIR)include&quot;;..\..\include;..\..\code"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_SECURE_SCL=0"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
@ -184,6 +186,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
@ -264,6 +267,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
@ -344,7 +348,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\NoBoostShared.vsprops" InheritedPropertySheets=".\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
@ -425,7 +429,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\NoBoostShared.vsprops" InheritedPropertySheets=".\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
@ -506,6 +510,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
@ -586,6 +591,7 @@
OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)" IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\shared\FastSTL.vsprops"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >

11
workspaces/vc9/shared/FastSTL.vsprops 100644
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>