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

Updated VC9 workspace. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@217 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2008-11-02 14:36:09 +00:00
parent ba93c7ef09
commit 4daa0294a2
4 changed files with 272 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
workspaces/vc9_ATMNotUpToDate/UnitTest.vcproj
View File

@ -668,6 +668,14 @@
RelativePath="..\..\test\unit\Main.cpp" RelativePath="..\..\test\unit\Main.cpp"
> >
</File> </File>
<File
RelativePath="..\..\test\unit\utFindInvalidData.cpp"
>
</File>
<File
RelativePath="..\..\test\unit\utFindInvalidData.h"
>
</File>
<File <File
RelativePath="..\..\test\unit\utFixInfacingNormals.cpp" RelativePath="..\..\test\unit\utFixInfacingNormals.cpp"
> >
@ -740,6 +748,14 @@
RelativePath="..\..\test\unit\utRemoveComments.h" RelativePath="..\..\test\unit\utRemoveComments.h"
> >
</File> </File>
<File
RelativePath="..\..\test\unit\utRemoveComponent.cpp"
>
</File>
<File
RelativePath="..\..\test\unit\utRemoveComponent.h"
>
</File>
<File <File
RelativePath="..\..\test\unit\utRemoveRedundantMaterials.cpp" RelativePath="..\..\test\unit\utRemoveRedundantMaterials.cpp"
> >

1
workspaces/vc9_ATMNotUpToDate/assimp.sln
View File

@ -71,6 +71,7 @@ Global
{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release_DLL|x64.ActiveCfg = Release_DLL|x64 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release_DLL|x64.ActiveCfg = Release_DLL|x64
{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release_DLL|x64.Build.0 = Release_DLL|x64 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release_DLL|x64.Build.0 = Release_DLL|x64
{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release|Win32.ActiveCfg = Release|Win32 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release|Win32.ActiveCfg = Release|Win32
{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release|Win32.Build.0 = Release|Win32
{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release|x64.ActiveCfg = Release|x64 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release|x64.ActiveCfg = Release|x64
{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release|x64.Build.0 = Release|x64 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release|x64.Build.0 = Release|x64
{FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug_DLL|Win32.ActiveCfg = Debug|Win32 {FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug_DLL|Win32.ActiveCfg = Debug|Win32

332
workspaces/vc9_ATMNotUpToDate/assimp.vcproj
View File

@ -41,14 +41,15 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories=""
PreprocessorDefinitions="DEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32" PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
SmallerTypeCheck="true" SmallerTypeCheck="true"
RuntimeLibrary="1" RuntimeLibrary="1"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="AssimpPCH.h"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="4" DebugInformationFormat="4"
@ -167,15 +168,16 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP"
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories=""
PreprocessorDefinitions="NDEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32" PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32"
StringPooling="true" StringPooling="true"
BufferSecurityCheck="false" BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2" EnableEnhancedInstructionSet="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="AssimpPCH.h"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
/> />
@ -240,7 +242,9 @@
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
BufferSecurityCheck="false" BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2" EnableEnhancedInstructionSet="0"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="AssimpPCH.h"
WarningLevel="3" WarningLevel="3"
/> />
<Tool <Tool
@ -295,7 +299,6 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP"
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
@ -305,6 +308,8 @@
RuntimeLibrary="2" RuntimeLibrary="2"
BufferSecurityCheck="false" BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2" EnableEnhancedInstructionSet="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="AssimpPCH.h"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
/> />
@ -344,7 +349,7 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="copy &quot;$(OutDir)\$(TargetFileName)&quot; &quot;$(SolutionDir)..\..\bin\unittest_$(ConfigurationName)_$(PlatformName)\&quot;" CommandLine=""
/> />
</Configuration> </Configuration>
<Configuration <Configuration
@ -380,7 +385,7 @@
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
BufferSecurityCheck="false" BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2" EnableEnhancedInstructionSet="0"
WarningLevel="3" WarningLevel="3"
/> />
<Tool <Tool
@ -446,7 +451,6 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories=""
PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_DLL_EXPORT" PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_DLL_EXPORT"
@ -454,6 +458,8 @@
SmallerTypeCheck="true" SmallerTypeCheck="true"
RuntimeLibrary="3" RuntimeLibrary="3"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="AssimpPCH.h"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="4" DebugInformationFormat="4"
@ -646,10 +652,6 @@
RelativePath="..\..\include\aiScene.h" RelativePath="..\..\include\aiScene.h"
> >
</File> </File>
<File
RelativePath="..\..\include\aiSceneEntities.h"
>
</File>
<File <File
RelativePath="..\..\include\aiTexture.h" RelativePath="..\..\include\aiTexture.h"
> >
@ -715,16 +717,12 @@
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="Boost_Workaround" Name="BoostWorkaround"
> >
<File <File
RelativePath="..\..\include\BoostWorkaround\boost\format.hpp" RelativePath="..\..\include\BoostWorkaround\boost\format.hpp"
> >
</File> </File>
<File
RelativePath="..\..\include\BoostWorkaround\boost\multi_array.hpp"
>
</File>
<File <File
RelativePath="..\..\include\BoostWorkaround\boost\scoped_ptr.hpp" RelativePath="..\..\include\BoostWorkaround\boost\scoped_ptr.hpp"
> >
@ -742,14 +740,6 @@
RelativePath="..\..\code\Assimp.cpp" RelativePath="..\..\code\Assimp.cpp"
> >
</File> </File>
<File
RelativePath="..\..\code\AssimpPCH.cpp"
>
</File>
<File
RelativePath="..\..\code\AssimpPCH.h"
>
</File>
<File <File
RelativePath="..\..\code\BaseImporter.cpp" RelativePath="..\..\code\BaseImporter.cpp"
> >
@ -798,14 +788,6 @@
RelativePath="..\..\code\FileLogStream.h" RelativePath="..\..\code\FileLogStream.h"
> >
</File> </File>
<File
RelativePath="..\..\code\FindDegenerates.cpp"
>
</File>
<File
RelativePath="..\..\code\FindDegenerates.h"
>
</File>
<File <File
RelativePath="..\..\code\GenericProperty.h" RelativePath="..\..\code\GenericProperty.h"
> >
@ -928,6 +910,46 @@
<File <File
RelativePath="..\..\code\extra\MakeVerboseFormat.cpp" RelativePath="..\..\code\extra\MakeVerboseFormat.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_DLL|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_DLL|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\code\extra\MakeVerboseFormat.h" RelativePath="..\..\code\extra\MakeVerboseFormat.h"
@ -941,46 +963,6 @@
<Filter <Filter
Name="Loaders" Name="Loaders"
> >
<File
RelativePath="..\..\code\ACLoader.cpp"
>
</File>
<File
RelativePath="..\..\code\ACLoader.h"
>
</File>
<File
RelativePath="..\..\code\BVHLoader.cpp"
>
</File>
<File
RelativePath="..\..\code\BVHLoader.h"
>
</File>
<File
RelativePath="..\..\code\IRRLoader.cpp"
>
</File>
<File
RelativePath="..\..\code\IRRLoader.h"
>
</File>
<File
RelativePath="..\..\code\IRRMeshLoader.cpp"
>
</File>
<File
RelativePath="..\..\code\IRRMeshLoader.h"
>
</File>
<File
RelativePath="..\..\code\LWSLoader.cpp"
>
</File>
<File
RelativePath="..\..\code\LWSLoader.h"
>
</File>
<Filter <Filter
Name="3DS" Name="3DS"
> >
@ -1340,6 +1322,74 @@
<Filter <Filter
Name="AC" Name="AC"
> >
<File
RelativePath="..\..\code\ACLoader.cpp"
>
</File>
<File
RelativePath="..\..\code\ACLoader.h"
>
</File>
</Filter>
<Filter
Name="LWS"
>
<File
RelativePath="..\..\code\LWSLoader.cpp"
>
</File>
<File
RelativePath="..\..\code\LWSLoader.h"
>
</File>
</Filter>
<Filter
Name="BVH"
>
<File
RelativePath="..\..\code\BVHLoader.cpp"
>
</File>
<File
RelativePath="..\..\code\BVHLoader.h"
>
</File>
</Filter>
<Filter
Name="IRRMesh"
>
<File
RelativePath="..\..\code\IRRMeshLoader.cpp"
>
</File>
<File
RelativePath="..\..\code\IRRMeshLoader.h"
>
</File>
</Filter>
<Filter
Name="IRR"
>
<File
RelativePath="..\..\code\IRRLoader.cpp"
>
</File>
<File
RelativePath="..\..\code\IRRLoader.h"
>
</File>
</Filter>
<Filter
Name="Q3D"
>
<File
RelativePath="..\..\code\Q3DLoader.cpp"
>
</File>
<File
RelativePath="..\..\code\Q3DLoader.h"
>
</File>
</Filter> </Filter>
</Filter> </Filter>
<Filter <Filter
@ -1361,6 +1411,14 @@
RelativePath="..\..\code\ConvertToLHProcess.h" RelativePath="..\..\code\ConvertToLHProcess.h"
> >
</File> </File>
<File
RelativePath="..\..\code\FindDegenerates.cpp"
>
</File>
<File
RelativePath="..\..\code\FindDegenerates.h"
>
</File>
<File <File
RelativePath="..\..\code\FindInvalidDataProcess.cpp" RelativePath="..\..\code\FindInvalidDataProcess.cpp"
> >
@ -1491,14 +1549,58 @@
</Filter> </Filter>
</Filter> </Filter>
<Filter <Filter
Name="Compiler" Name="PCH"
> >
<File <File
RelativePath="..\..\code\Compiler\poppack1.h" RelativePath="..\..\code\AssimpPCH.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
PrecompiledHeaderThrough="AssimpPCH.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
PrecompiledHeaderThrough="AssimpPCH.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_DLL|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
PrecompiledHeaderThrough="AssimpPCH.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_DLL|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
PrecompiledHeaderThrough="AssimpPCH.h"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\code\Compiler\pushpack1.h" RelativePath="..\..\code\AssimpPCH.h"
> >
</File> </File>
</Filter> </Filter>
@ -1509,10 +1611,6 @@
RelativePath="..\..\code\irrXML\CXMLReaderImpl.h" RelativePath="..\..\code\irrXML\CXMLReaderImpl.h"
> >
</File> </File>
<File
RelativePath="..\..\code\irrXML\fast_atof.h"
>
</File>
<File <File
RelativePath="..\..\code\irrXML\heapsort.h" RelativePath="..\..\code\irrXML\heapsort.h"
> >
@ -1532,6 +1630,78 @@
<File <File
RelativePath="..\..\code\irrXML\irrXML.cpp" RelativePath="..\..\code\irrXML\irrXML.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
BasicRuntimeChecks="0"
SmallerTypeCheck="true"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
BasicRuntimeChecks="0"
SmallerTypeCheck="false"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_DLL|Win32"
>
<Tool
Name="VCCLCompilerTool"
BasicRuntimeChecks="0"
SmallerTypeCheck="false"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_DLL|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_DLL|Win32"
>
<Tool
Name="VCCLCompilerTool"
BasicRuntimeChecks="0"
SmallerTypeCheck="false"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_DLL|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\code\irrXML\irrXML.h" RelativePath="..\..\code\irrXML\irrXML.h"

16
workspaces/vc9_ATMNotUpToDate/assimp_view.vcproj
View File

@ -43,7 +43,6 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;$(DXSDK_DIR)include&quot;;..\..\include;..\..\code" AdditionalIncludeDirectories="&quot;$(DXSDK_DIR)include&quot;;..\..\include;..\..\code"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
@ -54,7 +53,7 @@
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="true"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool
@ -206,13 +205,12 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP"
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"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="true"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
@ -368,13 +366,12 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP"
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"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="true"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
@ -529,7 +526,6 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;$(DXSDK_DIR)include&quot;;..\..\include;..\..\code" AdditionalIncludeDirectories="&quot;$(DXSDK_DIR)include&quot;;..\..\include;..\..\code"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
@ -540,7 +536,7 @@
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="true"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool
@ -760,10 +756,6 @@
RelativePath="..\..\tools\assimp_view\MessageProc.cpp" RelativePath="..\..\tools\assimp_view\MessageProc.cpp"
> >
</File> </File>
<File
RelativePath="..\..\tools\assimp_view\no_materials.fx"
>
</File>
<File <File
RelativePath="..\..\tools\assimp_view\Normals.cpp" RelativePath="..\..\tools\assimp_view\Normals.cpp"
> >