updated projectfiles: renamed collada-dom to colladadom, tosatisfy VisualStudio6. Added clock.cpp to GPUphysics

This commit is contained in:
ejcoumans
2006-10-05 00:05:54 +00:00
parent 71393bac40
commit 8bb89d4cef
12 changed files with 140 additions and 114 deletions

View File

@@ -104,6 +104,10 @@ SOURCE="$(InputPath)"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=..\..\Extras\GPUphysics\clock.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Extras\GPUphysics\fboSupport.cpp SOURCE=..\..\Extras\GPUphysics\fboSupport.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -120,6 +124,10 @@ SOURCE=..\..\Extras\GPUphysics\shaderSupport.cpp
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=..\..\Extras\GPUphysics\clock.h
# End Source File
# Begin Source File
SOURCE=..\..\Extras\GPUphysics\fboSupport.h SOURCE=..\..\Extras\GPUphysics\fboSupport.h
# End Source File # End Source File
# Begin Source File # Begin Source File

View File

@@ -1,24 +1,24 @@
# Microsoft Developer Studio Project File - Name="libcollada-dom" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="libcolladadom" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104 # TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=libcollada-dom - Win32 Release CFG=libcolladadom - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "libcollada-dom.mak". !MESSAGE NMAKE /f "libcolladadom.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "libcollada-dom.mak" CFG="libcollada-dom - Win32 Release" !MESSAGE NMAKE /f "libcolladadom.mak" CFG="libcolladadom - Win32 Release"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "libcollada-dom - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "libcolladadom - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "libcollada-dom - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "libcolladadom - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "libcollada-dom - Win32 Release" !IF "$(CFG)" == "libcolladadom - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
@@ -38,8 +38,8 @@ RSC=rc.exe
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\out\release6\build\libcollada-dom\" # PROP Output_Dir "..\..\out\release6\build\libcolladadom\"
# PROP Intermediate_Dir "..\..\out\release6\build\libcollada-dom\" # PROP Intermediate_Dir "..\..\out\release6\build\libcolladadom\"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
@@ -47,13 +47,13 @@ RSC=rc.exe
# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS"
# ADD BASE RSC /l 0x409 # ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libcollada-dom\libcollada-dom.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" # ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libcolladadom\libcolladadom.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\out\release6\libs\libcollada-dom.lib" # ADD LIB32 /nologo /out:"..\..\out\release6\libs\libcolladadom.lib"
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib /nologo /version:4.0 /machine:I386 /OPT:NOREF /subsystem:windows # ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib /nologo /version:4.0 /machine:I386 /OPT:NOREF /subsystem:windows
@@ -61,7 +61,7 @@ LINK32=link.exe
SOURCE="$(InputPath)" SOURCE="$(InputPath)"
# End Special Build Tool # End Special Build Tool
!ELSEIF "$(CFG)" == "libcollada-dom - Win32 Debug" !ELSEIF "$(CFG)" == "libcolladadom - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
@@ -70,8 +70,8 @@ SOURCE="$(InputPath)"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\out\debug6\build\libcollada-dom\" # PROP Output_Dir "..\..\out\debug6\build\libcolladadom\"
# PROP Intermediate_Dir "..\..\out\debug6\build\libcollada-dom\" # PROP Intermediate_Dir "..\..\out\debug6\build\libcolladadom\"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
@@ -79,13 +79,13 @@ SOURCE="$(InputPath)"
# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS"
# ADD BASE RSC /l 0x409 # ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libcollada-dom\libcollada-dom.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" # ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libcolladadom\libcolladadom.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\out\debug6\libs\libcollada-dom_d.lib" # ADD LIB32 /nologo /out:"..\..\out\debug6\libs\libcolladadom_d.lib"
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib /nologo /version:4.0 /machine:I386 /debug /pdbtype:sept /subsystem:windows # ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib /nologo /version:4.0 /machine:I386 /debug /pdbtype:sept /subsystem:windows
@@ -97,8 +97,8 @@ SOURCE="$(InputPath)"
# Begin Target # Begin Target
# Name "libcollada-dom - Win32 Release" # Name "libcolladadom - Win32 Release"
# Name "libcollada-dom - Win32 Debug" # Name "libcolladadom - Win32 Debug"
# Begin Group "Source Files" # Begin Group "Source Files"
# PROP Default_Filter "" # PROP Default_Filter ""

View File

@@ -24,7 +24,7 @@ Package=<4>
Project_Dep_Name libbulletopenglsupport Project_Dep_Name libbulletopenglsupport
End Project Dependency End Project Dependency
Begin Project Dependency Begin Project Dependency
Project_Dep_Name libcollada-dom Project_Dep_Name libcolladadom
End Project Dependency End Project Dependency
Begin Project Dependency Begin Project Dependency
Project_Dep_Name libconvexdecomposition Project_Dep_Name libconvexdecomposition
@@ -81,7 +81,7 @@ Package=<4>
Project_Dep_Name libbulletopenglsupport Project_Dep_Name libbulletopenglsupport
End Project Dependency End Project Dependency
Begin Project Dependency Begin Project Dependency
Project_Dep_Name libcollada-dom Project_Dep_Name libcolladadom
End Project Dependency End Project Dependency
Begin Project Dependency Begin Project Dependency
Project_Dep_Name libconvexdecomposition Project_Dep_Name libconvexdecomposition
@@ -234,7 +234,7 @@ Package=<4>
Project_Dep_Name libbulletopenglsupport Project_Dep_Name libbulletopenglsupport
End Project Dependency End Project Dependency
Begin Project Dependency Begin Project Dependency
Project_Dep_Name libcollada-dom Project_Dep_Name libcolladadom
End Project Dependency End Project Dependency
Begin Project Dependency Begin Project Dependency
Project_Dep_Name libconvexdecomposition Project_Dep_Name libconvexdecomposition
@@ -417,7 +417,7 @@ Package=<4>
Project_Dep_Name libbulletopenglsupport Project_Dep_Name libbulletopenglsupport
End Project Dependency End Project Dependency
Begin Project Dependency Begin Project Dependency
Project_Dep_Name libcollada-dom Project_Dep_Name libcolladadom
End Project Dependency End Project Dependency
Begin Project Dependency Begin Project Dependency
Project_Dep_Name libconvexdecomposition Project_Dep_Name libconvexdecomposition
@@ -504,7 +504,7 @@ Package=<4>
Project_Dep_Name libbulletopenglsupport Project_Dep_Name libbulletopenglsupport
End Project Dependency End Project Dependency
Begin Project Dependency Begin Project Dependency
Project_Dep_Name libcollada-dom Project_Dep_Name libcolladadom
End Project Dependency End Project Dependency
Begin Project Dependency Begin Project Dependency
Project_Dep_Name libconvexdecomposition Project_Dep_Name libconvexdecomposition
@@ -564,7 +564,7 @@ Package=<4>
############################################################################### ###############################################################################
Project: "libcollada-dom"=.\libcollada-dom.dsp - Package Owner=<4> Project: "libcolladadom"=.\libcolladadom.dsp - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{

View File

@@ -166,6 +166,9 @@
<Filter <Filter
Name="Source Files" Name="Source Files"
Filter=""> Filter="">
<File
RelativePath="..\..\Extras\GPUphysics\clock.cpp">
</File>
<File <File
RelativePath="..\..\Extras\GPUphysics\fboSupport.cpp"> RelativePath="..\..\Extras\GPUphysics\fboSupport.cpp">
</File> </File>
@@ -179,6 +182,9 @@
<Filter <Filter
Name="Header Files" Name="Header Files"
Filter=""> Filter="">
<File
RelativePath="..\..\Extras\GPUphysics\clock.h">
</File>
<File <File
RelativePath="..\..\Extras\GPUphysics\fboSupport.h"> RelativePath="..\..\Extras\GPUphysics\fboSupport.h">
</File> </File>

View File

@@ -2,8 +2,8 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="7.00" Version="7.00"
Name="libcollada-dom" Name="libcolladadom"
ProjectGUID="{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}" ProjectGUID="{6AB01C9C-9163-F400-B5C3-20D046631E17}"
SccProjectName="" SccProjectName=""
SccLocalPath=""> SccLocalPath="">
<Platforms> <Platforms>
@@ -13,8 +13,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="..\..\out\release7\build\libcollada-dom\" OutputDirectory="..\..\out\release7\build\libcolladadom\"
IntermediateDirectory="..\..\out\release7\build\libcollada-dom\" IntermediateDirectory="..\..\out\release7\build\libcolladadom\"
ConfigurationType="4" ConfigurationType="4"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
@@ -31,10 +31,10 @@
ExceptionHandling="0" ExceptionHandling="0"
AdditionalOptions=" " AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
PrecompiledHeaderFile="..\..\out\release7\build\libcollada-dom\libcollada-dom.pch" PrecompiledHeaderFile="..\..\out\release7\build\libcolladadom\libcolladadom.pch"
AssemblerListingLocation="..\..\out\release7\build\libcollada-dom\" AssemblerListingLocation="..\..\out\release7\build\libcolladadom\"
ObjectFile="..\..\out\release7\build\libcollada-dom\" ObjectFile="..\..\out\release7\build\libcolladadom\"
ProgramDataBaseFileName="..\..\out\release7\build\libcollada-dom\collada-dom.pdb" ProgramDataBaseFileName="..\..\out\release7\build\libcolladadom\colladadom.pdb"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE" Detect64BitPortabilityProblems="TRUE"
@@ -55,11 +55,11 @@
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
GenerateManifest="false" GenerateManifest="false"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
ProgramDatabaseFile="..\..\out\release7\build\libcollada-dom\collada-dom.pdb" ProgramDatabaseFile="..\..\out\release7\build\libcolladadom\colladadom.pdb"
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\out\release7\libs\libcollada-dom.lib" OutputFile="..\..\out\release7\libs\libcolladadom.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
@@ -67,7 +67,7 @@
MkTypLibCompatible="TRUE" MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName="..\..\out\release7\build\libcollada-dom\libcollada-dom.tlb"/> TypeLibraryName="..\..\out\release7\build\libcolladadom\libcolladadom.tlb"/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@@ -87,8 +87,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="..\..\out\debug7\build\libcollada-dom\" OutputDirectory="..\..\out\debug7\build\libcolladadom\"
IntermediateDirectory="..\..\out\debug7\build\libcollada-dom\" IntermediateDirectory="..\..\out\debug7\build\libcolladadom\"
ConfigurationType="4" ConfigurationType="4"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
@@ -104,10 +104,10 @@
ExceptionHandling="0" ExceptionHandling="0"
AdditionalOptions=" " AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
PrecompiledHeaderFile="..\..\out\debug7\build\libcollada-dom\libcollada-dom.pch" PrecompiledHeaderFile="..\..\out\debug7\build\libcolladadom\libcolladadom.pch"
AssemblerListingLocation="..\..\out\debug7\build\libcollada-dom\" AssemblerListingLocation="..\..\out\debug7\build\libcolladadom\"
ObjectFile="..\..\out\debug7\build\libcollada-dom\" ObjectFile="..\..\out\debug7\build\libcolladadom\"
ProgramDataBaseFileName="..\..\out\debug7\build\libcollada-dom\collada-dom.pdb" ProgramDataBaseFileName="..\..\out\debug7\build\libcolladadom\colladadom.pdb"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE" Detect64BitPortabilityProblems="TRUE"
@@ -126,11 +126,11 @@
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
GenerateManifest="false" GenerateManifest="false"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
ProgramDatabaseFile="..\..\out\debug7\build\libcollada-dom\collada-dom.pdb" ProgramDatabaseFile="..\..\out\debug7\build\libcolladadom\colladadom.pdb"
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\out\debug7\libs\libcollada-dom_d.lib" OutputFile="..\..\out\debug7\libs\libcolladadom_d.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
@@ -138,7 +138,7 @@
MkTypLibCompatible="TRUE" MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName="..\..\out\debug7\build\libcollada-dom\libcollada-dom.tlb"/> TypeLibraryName="..\..\out\debug7\build\libcolladadom\libcolladadom.tlb"/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />

View File

@@ -42,7 +42,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletm
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcollada-dom", "libcollada-dom.vcproj", "{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}"
EndProject EndProject
@@ -58,7 +58,7 @@ Global
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
{7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
@@ -69,7 +69,7 @@ Global
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
@@ -96,7 +96,7 @@ Global
{69C821C7-1E18-D894-068D-C55E063F4859}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {69C821C7-1E18-D894-068D-C55E063F4859}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{69C821C7-1E18-D894-068D-C55E063F4859}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {69C821C7-1E18-D894-068D-C55E063F4859}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{69C821C7-1E18-D894-068D-C55E063F4859}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {69C821C7-1E18-D894-068D-C55E063F4859}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{69C821C7-1E18-D894-068D-C55E063F4859}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {69C821C7-1E18-D894-068D-C55E063F4859}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{69C821C7-1E18-D894-068D-C55E063F4859}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {69C821C7-1E18-D894-068D-C55E063F4859}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
@@ -133,7 +133,7 @@ Global
{6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{6210A080-01C0-6D67-F1DB-669393175402}.18 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {6210A080-01C0-6D67-F1DB-669393175402}.18 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
@@ -154,7 +154,7 @@ Global
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
EndGlobalSection EndGlobalSection
@@ -243,10 +243,10 @@ Global
{7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32
{7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.ActiveCfg = Debug|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.ActiveCfg = Debug|Win32
{7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.Build.0 = Debug|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.Build.0 = Debug|Win32
{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Release.ActiveCfg = Release|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Release.ActiveCfg = Release|Win32
{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Release.Build.0 = Release|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Release.Build.0 = Release|Win32
{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Debug.ActiveCfg = Debug|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Debug.ActiveCfg = Debug|Win32
{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Debug.Build.0 = Debug|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Debug.Build.0 = Debug|Win32
{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.ActiveCfg = Release|Win32 {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.ActiveCfg = Release|Win32
{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.Build.0 = Release|Win32 {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.Build.0 = Release|Win32
{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.ActiveCfg = Debug|Win32 {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.ActiveCfg = Debug|Win32

View File

@@ -166,6 +166,9 @@
<Filter <Filter
Name="Source Files" Name="Source Files"
Filter=""> Filter="">
<File
RelativePath="..\..\Extras\GPUphysics\clock.cpp">
</File>
<File <File
RelativePath="..\..\Extras\GPUphysics\fboSupport.cpp"> RelativePath="..\..\Extras\GPUphysics\fboSupport.cpp">
</File> </File>
@@ -179,6 +182,9 @@
<Filter <Filter
Name="Header Files" Name="Header Files"
Filter=""> Filter="">
<File
RelativePath="..\..\Extras\GPUphysics\clock.h">
</File>
<File <File
RelativePath="..\..\Extras\GPUphysics\fboSupport.h"> RelativePath="..\..\Extras\GPUphysics\fboSupport.h">
</File> </File>

View File

@@ -2,8 +2,8 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="7.10" Version="7.10"
Name="libcollada-dom" Name="libcolladadom"
ProjectGUID="{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}" ProjectGUID="{6AB01C9C-9163-F400-B5C3-20D046631E17}"
SccProjectName="" SccProjectName=""
SccLocalPath=""> SccLocalPath="">
<Platforms> <Platforms>
@@ -13,8 +13,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="..\..\out\release71\build\libcollada-dom\" OutputDirectory="..\..\out\release71\build\libcolladadom\"
IntermediateDirectory="..\..\out\release71\build\libcollada-dom\" IntermediateDirectory="..\..\out\release71\build\libcolladadom\"
ConfigurationType="4" ConfigurationType="4"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
@@ -31,10 +31,10 @@
ExceptionHandling="0" ExceptionHandling="0"
AdditionalOptions=" " AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
PrecompiledHeaderFile="..\..\out\release71\build\libcollada-dom\libcollada-dom.pch" PrecompiledHeaderFile="..\..\out\release71\build\libcolladadom\libcolladadom.pch"
AssemblerListingLocation="..\..\out\release71\build\libcollada-dom\" AssemblerListingLocation="..\..\out\release71\build\libcolladadom\"
ObjectFile="..\..\out\release71\build\libcollada-dom\" ObjectFile="..\..\out\release71\build\libcolladadom\"
ProgramDataBaseFileName="..\..\out\release71\build\libcollada-dom\collada-dom.pdb" ProgramDataBaseFileName="..\..\out\release71\build\libcolladadom\colladadom.pdb"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE" Detect64BitPortabilityProblems="TRUE"
@@ -55,11 +55,11 @@
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
GenerateManifest="false" GenerateManifest="false"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
ProgramDatabaseFile="..\..\out\release71\build\libcollada-dom\collada-dom.pdb" ProgramDatabaseFile="..\..\out\release71\build\libcolladadom\colladadom.pdb"
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\out\release71\libs\libcollada-dom.lib" OutputFile="..\..\out\release71\libs\libcolladadom.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
@@ -67,7 +67,7 @@
MkTypLibCompatible="TRUE" MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName="..\..\out\release71\build\libcollada-dom\libcollada-dom.tlb"/> TypeLibraryName="..\..\out\release71\build\libcolladadom\libcolladadom.tlb"/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@@ -87,8 +87,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="..\..\out\debug71\build\libcollada-dom\" OutputDirectory="..\..\out\debug71\build\libcolladadom\"
IntermediateDirectory="..\..\out\debug71\build\libcollada-dom\" IntermediateDirectory="..\..\out\debug71\build\libcolladadom\"
ConfigurationType="4" ConfigurationType="4"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
@@ -104,10 +104,10 @@
ExceptionHandling="0" ExceptionHandling="0"
AdditionalOptions=" " AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
PrecompiledHeaderFile="..\..\out\debug71\build\libcollada-dom\libcollada-dom.pch" PrecompiledHeaderFile="..\..\out\debug71\build\libcolladadom\libcolladadom.pch"
AssemblerListingLocation="..\..\out\debug71\build\libcollada-dom\" AssemblerListingLocation="..\..\out\debug71\build\libcolladadom\"
ObjectFile="..\..\out\debug71\build\libcollada-dom\" ObjectFile="..\..\out\debug71\build\libcolladadom\"
ProgramDataBaseFileName="..\..\out\debug71\build\libcollada-dom\collada-dom.pdb" ProgramDataBaseFileName="..\..\out\debug71\build\libcolladadom\colladadom.pdb"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE" Detect64BitPortabilityProblems="TRUE"
@@ -126,11 +126,11 @@
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
GenerateManifest="false" GenerateManifest="false"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
ProgramDatabaseFile="..\..\out\debug71\build\libcollada-dom\collada-dom.pdb" ProgramDatabaseFile="..\..\out\debug71\build\libcolladadom\colladadom.pdb"
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\out\debug71\libs\libcollada-dom_d.lib" OutputFile="..\..\out\debug71\libs\libcolladadom_d.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
@@ -138,7 +138,7 @@
MkTypLibCompatible="TRUE" MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName="..\..\out\debug71\build\libcollada-dom\libcollada-dom.tlb"/> TypeLibraryName="..\..\out\debug71\build\libcolladadom\libcolladadom.tlb"/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />

View File

@@ -42,7 +42,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletm
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcollada-dom", "libcollada-dom.vcproj", "{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}"
EndProject EndProject
@@ -58,7 +58,7 @@ Global
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
{7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
@@ -69,7 +69,7 @@ Global
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
@@ -96,7 +96,7 @@ Global
{69C821C7-1E18-D894-068D-C55E063F4859}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {69C821C7-1E18-D894-068D-C55E063F4859}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{69C821C7-1E18-D894-068D-C55E063F4859}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {69C821C7-1E18-D894-068D-C55E063F4859}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{69C821C7-1E18-D894-068D-C55E063F4859}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {69C821C7-1E18-D894-068D-C55E063F4859}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{69C821C7-1E18-D894-068D-C55E063F4859}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {69C821C7-1E18-D894-068D-C55E063F4859}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{69C821C7-1E18-D894-068D-C55E063F4859}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {69C821C7-1E18-D894-068D-C55E063F4859}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
@@ -133,7 +133,7 @@ Global
{6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{6210A080-01C0-6D67-F1DB-669393175402}.18 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {6210A080-01C0-6D67-F1DB-669393175402}.18 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
@@ -154,7 +154,7 @@ Global
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
EndGlobalSection EndGlobalSection
@@ -243,10 +243,10 @@ Global
{7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32
{7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.ActiveCfg = Debug|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.ActiveCfg = Debug|Win32
{7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.Build.0 = Debug|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.Build.0 = Debug|Win32
{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Release.ActiveCfg = Release|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Release.ActiveCfg = Release|Win32
{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Release.Build.0 = Release|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Release.Build.0 = Release|Win32
{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Debug.ActiveCfg = Debug|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Debug.ActiveCfg = Debug|Win32
{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Debug.Build.0 = Debug|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Debug.Build.0 = Debug|Win32
{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.ActiveCfg = Release|Win32 {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.ActiveCfg = Release|Win32
{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.Build.0 = Release|Win32 {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.Build.0 = Release|Win32
{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.ActiveCfg = Debug|Win32 {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.ActiveCfg = Debug|Win32

View File

@@ -166,6 +166,9 @@
<Filter <Filter
Name="Source Files" Name="Source Files"
Filter=""> Filter="">
<File
RelativePath="..\..\Extras\GPUphysics\clock.cpp">
</File>
<File <File
RelativePath="..\..\Extras\GPUphysics\fboSupport.cpp"> RelativePath="..\..\Extras\GPUphysics\fboSupport.cpp">
</File> </File>
@@ -179,6 +182,9 @@
<Filter <Filter
Name="Header Files" Name="Header Files"
Filter=""> Filter="">
<File
RelativePath="..\..\Extras\GPUphysics\clock.h">
</File>
<File <File
RelativePath="..\..\Extras\GPUphysics\fboSupport.h"> RelativePath="..\..\Extras\GPUphysics\fboSupport.h">
</File> </File>

View File

@@ -2,8 +2,8 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="libcollada-dom" Name="libcolladadom"
ProjectGUID="{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}" ProjectGUID="{6AB01C9C-9163-F400-B5C3-20D046631E17}"
SccProjectName="" SccProjectName=""
SccLocalPath=""> SccLocalPath="">
<Platforms> <Platforms>
@@ -13,8 +13,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="..\..\out\release8\build\libcollada-dom\" OutputDirectory="..\..\out\release8\build\libcolladadom\"
IntermediateDirectory="..\..\out\release8\build\libcollada-dom\" IntermediateDirectory="..\..\out\release8\build\libcolladadom\"
ConfigurationType="4" ConfigurationType="4"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
@@ -31,10 +31,10 @@
ExceptionHandling="0" ExceptionHandling="0"
AdditionalOptions=" " AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
PrecompiledHeaderFile="..\..\out\release8\build\libcollada-dom\libcollada-dom.pch" PrecompiledHeaderFile="..\..\out\release8\build\libcolladadom\libcolladadom.pch"
AssemblerListingLocation="..\..\out\release8\build\libcollada-dom\" AssemblerListingLocation="..\..\out\release8\build\libcolladadom\"
ObjectFile="..\..\out\release8\build\libcollada-dom\" ObjectFile="..\..\out\release8\build\libcolladadom\"
ProgramDataBaseFileName="..\..\out\release8\build\libcollada-dom\collada-dom.pdb" ProgramDataBaseFileName="..\..\out\release8\build\libcolladadom\colladadom.pdb"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE" Detect64BitPortabilityProblems="TRUE"
@@ -55,11 +55,11 @@
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
GenerateManifest="false" GenerateManifest="false"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
ProgramDatabaseFile="..\..\out\release8\build\libcollada-dom\collada-dom.pdb" ProgramDatabaseFile="..\..\out\release8\build\libcolladadom\colladadom.pdb"
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\out\release8\libs\libcollada-dom.lib" OutputFile="..\..\out\release8\libs\libcolladadom.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
@@ -67,7 +67,7 @@
MkTypLibCompatible="TRUE" MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName="..\..\out\release8\build\libcollada-dom\libcollada-dom.tlb"/> TypeLibraryName="..\..\out\release8\build\libcolladadom\libcolladadom.tlb"/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@@ -87,8 +87,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="..\..\out\debug8\build\libcollada-dom\" OutputDirectory="..\..\out\debug8\build\libcolladadom\"
IntermediateDirectory="..\..\out\debug8\build\libcollada-dom\" IntermediateDirectory="..\..\out\debug8\build\libcolladadom\"
ConfigurationType="4" ConfigurationType="4"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
@@ -104,10 +104,10 @@
ExceptionHandling="0" ExceptionHandling="0"
AdditionalOptions=" " AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
PrecompiledHeaderFile="..\..\out\debug8\build\libcollada-dom\libcollada-dom.pch" PrecompiledHeaderFile="..\..\out\debug8\build\libcolladadom\libcolladadom.pch"
AssemblerListingLocation="..\..\out\debug8\build\libcollada-dom\" AssemblerListingLocation="..\..\out\debug8\build\libcolladadom\"
ObjectFile="..\..\out\debug8\build\libcollada-dom\" ObjectFile="..\..\out\debug8\build\libcolladadom\"
ProgramDataBaseFileName="..\..\out\debug8\build\libcollada-dom\collada-dom.pdb" ProgramDataBaseFileName="..\..\out\debug8\build\libcolladadom\colladadom.pdb"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE" Detect64BitPortabilityProblems="TRUE"
@@ -126,11 +126,11 @@
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
GenerateManifest="false" GenerateManifest="false"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
ProgramDatabaseFile="..\..\out\debug8\build\libcollada-dom\collada-dom.pdb" ProgramDatabaseFile="..\..\out\debug8\build\libcolladadom\colladadom.pdb"
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\out\debug8\libs\libcollada-dom_d.lib" OutputFile="..\..\out\debug8\libs\libcolladadom_d.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
@@ -138,7 +138,7 @@
MkTypLibCompatible="TRUE" MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName="..\..\out\debug8\build\libcollada-dom\libcollada-dom.tlb"/> TypeLibraryName="..\..\out\debug8\build\libcolladadom\libcolladadom.tlb"/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />

View File

@@ -42,7 +42,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletm
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcollada-dom", "libcollada-dom.vcproj", "{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}"
EndProject EndProject
@@ -58,7 +58,7 @@ Global
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
{7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
@@ -69,7 +69,7 @@ Global
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
@@ -96,7 +96,7 @@ Global
{69C821C7-1E18-D894-068D-C55E063F4859}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {69C821C7-1E18-D894-068D-C55E063F4859}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{69C821C7-1E18-D894-068D-C55E063F4859}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {69C821C7-1E18-D894-068D-C55E063F4859}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{69C821C7-1E18-D894-068D-C55E063F4859}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {69C821C7-1E18-D894-068D-C55E063F4859}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{69C821C7-1E18-D894-068D-C55E063F4859}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {69C821C7-1E18-D894-068D-C55E063F4859}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{69C821C7-1E18-D894-068D-C55E063F4859}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {69C821C7-1E18-D894-068D-C55E063F4859}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
@@ -133,7 +133,7 @@ Global
{6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{6210A080-01C0-6D67-F1DB-669393175402}.18 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {6210A080-01C0-6D67-F1DB-669393175402}.18 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
@@ -154,7 +154,7 @@ Global
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
EndGlobalSection EndGlobalSection
@@ -243,10 +243,10 @@ Global
{7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32
{7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.ActiveCfg = Debug|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.ActiveCfg = Debug|Win32
{7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.Build.0 = Debug|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.Build.0 = Debug|Win32
{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Release.ActiveCfg = Release|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Release.ActiveCfg = Release|Win32
{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Release.Build.0 = Release|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Release.Build.0 = Release|Win32
{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Debug.ActiveCfg = Debug|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Debug.ActiveCfg = Debug|Win32
{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Debug.Build.0 = Debug|Win32 {6AB01C9C-9163-F400-B5C3-20D046631E17}.Debug.Build.0 = Debug|Win32
{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.ActiveCfg = Release|Win32 {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.ActiveCfg = Release|Win32
{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.Build.0 = Release|Win32 {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.Build.0 = Release|Win32
{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.ActiveCfg = Debug|Win32 {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.ActiveCfg = Debug|Win32