[flatland-cvs] flatland/build/VisualStudio complex-demo.vcproj,1.2,1.3 flatland.sln,1.1.1.1,1.2 flat
Status: Alpha
Brought to you by:
prideout
From: Philip R. <pri...@us...> - 2006-04-23 17:23:59
|
Update of /cvsroot/flatland/flatland/build/VisualStudio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21296/build/VisualStudio Modified Files: complex-demo.vcproj flatland.sln flatland.vcproj resource.h simple-demo.vcproj Log Message: - converted project to VStudio 2005 - added a #include to fix compilation problem (Joel Horne) - added to build instructions to refer to gl and wgl headers - added an item to the release procedure (add a news item) - fixed atan bug in flatland.cpp (gorchillo) - fixed line-ending problem in simple.cpp (gorchillo) - fixed virtual destructors (gorchillo) Index: flatland.sln =================================================================== RCS file: /cvsroot/flatland/flatland/build/VisualStudio/flatland.sln,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** flatland.sln 26 Feb 2005 19:26:59 -0000 1.1.1.1 --- flatland.sln 23 Apr 2006 17:23:50 -0000 1.2 *************** *** 1,35 **** ! Microsoft Visual Studio Solution File, Format Version 7.00 ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complex-demo", "complex-demo.vcproj", "{9AE76684-F831-417C-AC3B-8A47B9BF75F2}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple-demo", "simple-demo.vcproj", "{157D72F1-3E1E-4A2C-BC46-ED715A73B11B}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flatland", "flatland.vcproj", "{885D23A9-8136-4E65-BC65-436A6D63DFE4}" ! EndProject ! Global ! GlobalSection(SolutionConfiguration) = preSolution ! ConfigName.0 = Debug ! ConfigName.1 = Release ! EndGlobalSection ! GlobalSection(ProjectDependencies) = postSolution ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.0 = {885D23A9-8136-4E65-BC65-436A6D63DFE4} ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.0 = {885D23A9-8136-4E65-BC65-436A6D63DFE4} ! EndGlobalSection ! GlobalSection(ProjectConfiguration) = postSolution ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Debug.ActiveCfg = Debug|Win32 ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Debug.Build.0 = Debug|Win32 ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Release.ActiveCfg = Release|Win32 ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Release.Build.0 = Release|Win32 ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Debug.ActiveCfg = Debug|Win32 ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Debug.Build.0 = Debug|Win32 ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Release.ActiveCfg = Release|Win32 ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Release.Build.0 = Release|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Debug.ActiveCfg = Debug|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Debug.Build.0 = Debug|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Release.ActiveCfg = Release|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Release.Build.0 = Release|Win32 ! EndGlobalSection ! GlobalSection(ExtensibilityGlobals) = postSolution ! EndGlobalSection ! GlobalSection(ExtensibilityAddIns) = postSolution ! EndGlobalSection ! EndGlobal --- 1,37 ---- ! Microsoft Visual Studio Solution File, Format Version 9.00 ! # Visual Studio 2005 ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complex-demo", "complex-demo.vcproj", "{9AE76684-F831-417C-AC3B-8A47B9BF75F2}" ! ProjectSection(ProjectDependencies) = postProject ! {885D23A9-8136-4E65-BC65-436A6D63DFE4} = {885D23A9-8136-4E65-BC65-436A6D63DFE4} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple-demo", "simple-demo.vcproj", "{157D72F1-3E1E-4A2C-BC46-ED715A73B11B}" ! ProjectSection(ProjectDependencies) = postProject ! {885D23A9-8136-4E65-BC65-436A6D63DFE4} = {885D23A9-8136-4E65-BC65-436A6D63DFE4} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flatland", "flatland.vcproj", "{885D23A9-8136-4E65-BC65-436A6D63DFE4}" ! EndProject ! Global ! GlobalSection(SolutionConfigurationPlatforms) = preSolution ! Debug|Win32 = Debug|Win32 ! Release|Win32 = Release|Win32 ! EndGlobalSection ! GlobalSection(ProjectConfigurationPlatforms) = postSolution ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Debug|Win32.ActiveCfg = Debug|Win32 ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Debug|Win32.Build.0 = Debug|Win32 ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Release|Win32.ActiveCfg = Release|Win32 ! {9AE76684-F831-417C-AC3B-8A47B9BF75F2}.Release|Win32.Build.0 = Release|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Debug|Win32.ActiveCfg = Debug|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Debug|Win32.Build.0 = Debug|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Release|Win32.ActiveCfg = Release|Win32 ! {157D72F1-3E1E-4A2C-BC46-ED715A73B11B}.Release|Win32.Build.0 = Release|Win32 ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Debug|Win32.ActiveCfg = Debug|Win32 ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Debug|Win32.Build.0 = Debug|Win32 ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Release|Win32.ActiveCfg = Release|Win32 ! {885D23A9-8136-4E65-BC65-436A6D63DFE4}.Release|Win32.Build.0 = Release|Win32 ! EndGlobalSection ! GlobalSection(SolutionProperties) = preSolution ! HideSolutionNode = FALSE ! EndGlobalSection ! EndGlobal Index: simple-demo.vcproj =================================================================== RCS file: /cvsroot/flatland/flatland/build/VisualStudio/simple-demo.vcproj,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** simple-demo.vcproj 26 Feb 2005 19:26:59 -0000 1.1.1.1 --- simple-demo.vcproj 23 Apr 2006 17:23:50 -0000 1.2 *************** *** 1,141 **** ! <?xml version="1.0" encoding = "Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.00" ! Name="simple-demo" ! ProjectGUID="{157D72F1-3E1E-4A2C-BC46-ED715A73B11B}" ! Keyword="Win32Proj"> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="SimpleDebug" ! IntermediateDirectory="SimpleDebug" ! ConfigurationType="1" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="..\..;." ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" ! MinimalRebuild="TRUE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="5" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="TRUE" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4244;4311;4305;4267"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib sdl.lib glu32.lib" ! OutputFile="$(OutDir)/simple-demo.exe" ! LinkIncremental="2" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile="$(OutDir)/simple-demo.pdb" ! SubSystem="2" ! TargetMachine="1"/> ! <Tool ! Name="VCMIDLTool"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="SimpleRelease" ! IntermediateDirectory="SimpleRelease" ! ConfigurationType="1" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! OmitFramePointers="TRUE" ! AdditionalIncludeDirectories="..\..;." ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" ! StringPooling="TRUE" ! RuntimeLibrary="4" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="TRUE" ! DebugInformationFormat="0" ! DisableSpecificWarnings="4244;4311;4305;4267"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib sdl.lib glu32.lib" ! OutputFile="$(OutDir)/simple-demo.exe" ! LinkIncremental="1" ! GenerateDebugInformation="FALSE" ! SubSystem="2" ! OptimizeReferences="2" ! EnableCOMDATFolding="2" ! TargetMachine="1"/> ! <Tool ! Name="VCMIDLTool"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! </Configurations> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> ! <File ! RelativePath="..\..\demo\demo.cpp"> ! </File> ! <File ! RelativePath="..\..\demo\platform.cpp"> ! </File> ! <File ! RelativePath="..\..\demo\simple.cpp"> ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc"> ! <File ! RelativePath="..\..\demo\demo.h"> ! </File> ! <File ! RelativePath="..\..\demo\platform.h"> ! </File> ! </Filter> ! <Filter ! Name="Resource Files" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> ! <File ! RelativePath="demo.rc"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,228 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="8.00" ! Name="simple-demo" ! ProjectGUID="{157D72F1-3E1E-4A2C-BC46-ED715A73B11B}" ! Keyword="Win32Proj" ! > ! <Platforms> ! <Platform ! Name="Win32" ! /> ! </Platforms> ! <ToolFiles> ! </ToolFiles> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="SimpleDebug" ! IntermediateDirectory="SimpleDebug" ! ConfigurationType="1" ! InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="..\..;." ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" ! MinimalRebuild="true" ! BasicRuntimeChecks="3" ! RuntimeLibrary="1" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4244;4311;4305;4267;4996" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib sdl.lib glu32.lib" ! OutputFile="$(OutDir)/simple-demo.exe" ! LinkIncremental="2" ! GenerateDebugInformation="true" ! ProgramDatabaseFile="$(OutDir)/simple-demo.pdb" ! SubSystem="2" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="SimpleRelease" ! IntermediateDirectory="SimpleRelease" ! ConfigurationType="1" ! InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! OmitFramePointers="true" ! AdditionalIncludeDirectories="..\..;." ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" ! StringPooling="true" ! RuntimeLibrary="0" ! EnableFunctionLevelLinking="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="0" ! DisableSpecificWarnings="4244;4311;4305;4267;4996" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib sdl.lib glu32.lib" ! OutputFile="$(OutDir)/simple-demo.exe" ! LinkIncremental="1" ! GenerateDebugInformation="false" ! SubSystem="2" ! OptimizeReferences="2" ! EnableCOMDATFolding="2" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" ! > ! <File ! RelativePath="..\..\demo\demo.cpp" ! > ! </File> ! <File ! RelativePath="..\..\demo\platform.cpp" ! > ! </File> ! <File ! RelativePath="..\..\demo\simple.cpp" ! > ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc" ! > ! <File ! RelativePath="..\..\demo\demo.h" ! > ! </File> ! <File ! RelativePath="..\..\demo\platform.h" ! > ! </File> ! </Filter> ! <Filter ! Name="Resource Files" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! > ! <File ! RelativePath="demo.rc" ! > ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> Index: flatland.vcproj =================================================================== RCS file: /cvsroot/flatland/flatland/build/VisualStudio/flatland.vcproj,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** flatland.vcproj 26 Feb 2005 19:26:59 -0000 1.1.1.1 --- flatland.vcproj 23 Apr 2006 17:23:50 -0000 1.2 *************** *** 1,220 **** ! <?xml version="1.0" encoding = "Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.00" ! Name="flatland" ! ProjectGUID="{885D23A9-8136-4E65-BC65-436A6D63DFE4}" ! Keyword="Win32Proj"> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="Debug" ! IntermediateDirectory="Debug" ! ConfigurationType="4" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="..\.." ! PreprocessorDefinitions="WIN32;_DEBUG;_LIB" ! MinimalRebuild="TRUE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="5" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="TRUE" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4244;4311;4305;4267"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLibrarianTool" ! OutputFile="$(OutDir)/flatland.lib"/> ! <Tool ! Name="VCMIDLTool"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="Release" ! IntermediateDirectory="Release" ! ConfigurationType="4" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! OmitFramePointers="TRUE" ! AdditionalIncludeDirectories="..\.." ! PreprocessorDefinitions="WIN32;NDEBUG;_LIB" ! StringPooling="TRUE" ! RuntimeLibrary="4" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="TRUE" ! DebugInformationFormat="0" ! DisableSpecificWarnings="4244;4311;4305;4267"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLibrarianTool" ! OutputFile="$(OutDir)/flatland.lib"/> ! <Tool ! Name="VCMIDLTool"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! </Configuration> ! </Configurations> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> ! <File ! RelativePath="..\..\flatland\circle-circle.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\composite-all.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\flatland.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\intersection.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\quad-circle.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\quad-quad.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\shapes.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\terrain-all.cpp"> ! </File> ! <File ! RelativePath="..\..\flatland\vector.cpp"> ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc"> ! <File ! RelativePath="..\..\flatland\aabb.h"> ! </File> ! <File ! RelativePath="..\..\flatland\enums.h"> ! </File> ! <File ! RelativePath="..\..\flatland\flatland.h"> ! </File> ! <File ! RelativePath="..\..\flatland\intersection.h"> ! </File> ! <File ! RelativePath="..\..\flatland\shapes.h"> ! </File> ! <File ! RelativePath="..\..\flatland\vector.h"> ! </File> ! </Filter> ! <Filter ! Name="ode" ! Filter=""> ! <File ! RelativePath="..\..\ode\src\array.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\error.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\fastdot.c"> ! </File> ! <File ! RelativePath="..\..\ode\src\fastldlt.c"> ! </File> ! <File ! RelativePath="..\..\ode\src\fastlsolve.c"> ! </File> ! <File ! RelativePath="..\..\ode\src\fastltsolve.c"> ! </File> ! <File ! RelativePath="..\..\ode\src\joint.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\lcp.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\mass.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\mat.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\matrix.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\memory.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\misc.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\obstack.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\ode.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\odemath.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\quickstep.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\rotation.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\step.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\stepfast.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\testing.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\timer.cpp"> ! </File> ! <File ! RelativePath="..\..\ode\src\util.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,324 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="8.00" ! Name="flatland" ! ProjectGUID="{885D23A9-8136-4E65-BC65-436A6D63DFE4}" ! Keyword="Win32Proj" ! > ! <Platforms> ! <Platform ! Name="Win32" ! /> ! </Platforms> ! <ToolFiles> ! </ToolFiles> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="Debug" ! IntermediateDirectory="Debug" ! ConfigurationType="4" ! InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="..\.." ! PreprocessorDefinitions="WIN32;_DEBUG;_LIB" ! MinimalRebuild="true" ! BasicRuntimeChecks="3" ! RuntimeLibrary="1" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4244;4311;4305;4267;4996" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLibrarianTool" ! OutputFile="$(OutDir)/flatland.lib" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="Release" ! IntermediateDirectory="Release" ! ConfigurationType="4" ! InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! OmitFramePointers="true" ! AdditionalIncludeDirectories="..\.." ! PreprocessorDefinitions="WIN32;NDEBUG;_LIB" ! StringPooling="true" ! RuntimeLibrary="0" ! EnableFunctionLevelLinking="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="0" ! DisableSpecificWarnings="4244;4311;4305;4267;4996" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLibrarianTool" ! OutputFile="$(OutDir)/flatland.lib" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" ! > ! <File ! RelativePath="..\..\flatland\circle-circle.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\composite-all.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\flatland.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\intersection.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\quad-circle.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\quad-quad.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\shapes.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\terrain-all.cpp" ! > ! </File> ! <File ! RelativePath="..\..\flatland\vector.cpp" ! > ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc" ! > ! <File ! RelativePath="..\..\flatland\aabb.h" ! > ! </File> ! <File ! RelativePath="..\..\flatland\enums.h" ! > ! </File> ! <File ! RelativePath="..\..\flatland\flatland.h" ! > ! </File> ! <File ! RelativePath="..\..\flatland\intersection.h" ! > ! </File> ! <File ! RelativePath="..\..\flatland\shapes.h" ! > ! </File> ! <File ! RelativePath="..\..\flatland\vector.h" ! > ! </File> ! </Filter> ! <Filter ! Name="ode" ! > ! <File ! RelativePath="..\..\ode\src\array.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\error.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\fastdot.c" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\fastldlt.c" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\fastlsolve.c" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\fastltsolve.c" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\joint.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\lcp.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\mass.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\mat.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\matrix.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\memory.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\misc.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\obstack.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\ode.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\odemath.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\quickstep.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\rotation.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\step.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\stepfast.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\testing.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\timer.cpp" ! > ! </File> ! <File ! RelativePath="..\..\ode\src\util.cpp" ! > ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> Index: resource.h =================================================================== RCS file: /cvsroot/flatland/flatland/build/VisualStudio/resource.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** resource.h 26 Feb 2005 19:26:59 -0000 1.1.1.1 --- resource.h 23 Apr 2006 17:23:50 -0000 1.2 *************** *** 1,17 **** ! //{{NO_DEPENDENCIES}} ! // Microsoft Visual C++ generated include file. ! // Used by complex-demo.rc ! // ! #define IDI_BIG 101 ! #define IDI_SMALL 102 ! ! // Next default values for new objects ! // ! #ifdef APSTUDIO_INVOKED ! #ifndef APSTUDIO_READONLY_SYMBOLS ! #define _APS_NEXT_RESOURCE_VALUE 103 ! #define _APS_NEXT_COMMAND_VALUE 40001 ! #define _APS_NEXT_CONTROL_VALUE 1001 ! #define _APS_NEXT_SYMED_VALUE 101 ! #endif ! #endif --- 1,34 ---- ! //{{NO_DEPENDENCIES}} ! ! // Microsoft Visual C++ generated include file. ! ! // Used by complex-demo.rc ! ! // ! ! #define IDI_BIG 101 ! ! #define IDI_SMALL 102 ! ! ! ! // Next default values for new objects ! ! // ! ! #ifdef APSTUDIO_INVOKED ! ! #ifndef APSTUDIO_READONLY_SYMBOLS ! ! #define _APS_NEXT_RESOURCE_VALUE 103 ! ! #define _APS_NEXT_COMMAND_VALUE 40001 ! ! #define _APS_NEXT_CONTROL_VALUE 1001 ! ! #define _APS_NEXT_SYMED_VALUE 101 ! ! #endif ! ! #endif ! Index: complex-demo.vcproj =================================================================== RCS file: /cvsroot/flatland/flatland/build/VisualStudio/complex-demo.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** complex-demo.vcproj 3 Jul 2005 20:00:49 -0000 1.2 --- complex-demo.vcproj 23 Apr 2006 17:23:50 -0000 1.3 *************** *** 1 **** ! <?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.00" Name="complex-demo" ProjectGUID="{9AE76684-F831-417C-AC3B-8A47B9BF75F2}" Keyword="Win32Proj"> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="ComplexDebug" IntermediateDirectory="ComplexDebug" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..;." PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="5" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="4" DisableSpecificWarnings="4244;4311;4305;4267"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="opengl32.lib sdl.lib" OutputFile="$(OutDir)/complex-demo.exe" LinkIncremental="2" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(OutDir)/complex-demo.pdb" SubSystem="2" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="ComplexRelease" IntermediateDirectory="ComplexRelease" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" OmitFramePointers="TRUE" AdditionalIncludeDirectories="..\..;." PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" StringPooling="TRUE" RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="0" DisableSpecificWarnings="4244;4311;4305;4267"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="opengl32.lib sdl.lib" OutputFile="$(OutDir)/complex-demo.exe" LinkIncremental="1" GenerateDebugInformation="FALSE" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> </Configurations> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> <File RelativePath="..\..\demo\complex.cpp"> </File> <File RelativePath="..\..\demo\demo.cpp"> </File> <File RelativePath="..\..\demo\platform.cpp"> </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc"> <File RelativePath="..\..\demo\demo.h"> </File> <File RelativePath="..\..\demo\platform.h"> </File> </Filter> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> <File RelativePath="demo.rc"> </File> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> \ No newline at end of file --- 1,228 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="8.00" ! Name="complex-demo" ! ProjectGUID="{9AE76684-F831-417C-AC3B-8A47B9BF75F2}" ! Keyword="Win32Proj" ! > ! <Platforms> ! <Platform ! Name="Win32" ! /> ! </Platforms> ! <ToolFiles> ! </ToolFiles> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="ComplexDebug" ! IntermediateDirectory="ComplexDebug" ! ConfigurationType="1" ! InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="..\..;." ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" ! MinimalRebuild="true" ! BasicRuntimeChecks="3" ! RuntimeLibrary="1" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4244;4311;4305;4267;4996" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib sdl.lib" ! OutputFile="$(OutDir)/complex-demo.exe" ! LinkIncremental="2" ! GenerateDebugInformation="true" ! ProgramDatabaseFile="$(OutDir)/complex-demo.pdb" ! SubSystem="2" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="ComplexRelease" ! IntermediateDirectory="ComplexRelease" ! ConfigurationType="1" ! InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! OmitFramePointers="true" ! AdditionalIncludeDirectories="..\..;." ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" ! StringPooling="true" ! RuntimeLibrary="0" ! EnableFunctionLevelLinking="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="0" ! DisableSpecificWarnings="4244;4311;4305;4267;4996" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib sdl.lib" ! OutputFile="$(OutDir)/complex-demo.exe" ! LinkIncremental="1" ! GenerateDebugInformation="false" ! SubSystem="2" ! OptimizeReferences="2" ! EnableCOMDATFolding="2" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" ! > ! <File ! RelativePath="..\..\demo\complex.cpp" ! > ! </File> ! <File ! RelativePath="..\..\demo\demo.cpp" ! > ! </File> ! <File ! RelativePath="..\..\demo\platform.cpp" ! > ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc" ! > ! <File ! RelativePath="..\..\demo\demo.h" ! > ! </File> ! <File ! RelativePath="..\..\demo\platform.h" ! > ! </File> ! </Filter> ! <Filter ! Name="Resource Files" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! > ! <File ! RelativePath="demo.rc" ! > ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> |