Changeset 1919

Timestamp:

Oct 14, 2008, 5:02:25 PM (16 years ago)

Author:

rgrieder

Message:

Added OgreODE to our source repository because already we really need the newest version. And there is no hope to find any packages under linux.
The files included should compile and link with Ogre 1.4/1.6 and ODE 0.9/0.10. I was only able to test Ogre 1.4 and ODE 0.9/.10 under msvc until now.

Location:

code/branches/physics

Files:

• src/CMakeLists.txt (modified) (1 diff)
• src/ogreode (added)
• src/ogreode/CMakeLists.txt (added)
• src/ogreode/OgreOdeBody.cpp (added)
• src/ogreode/OgreOdeBody.h (added)
• src/ogreode/OgreOdeCollision.cpp (added)
• src/ogreode/OgreOdeCollision.h (added)
• src/ogreode/OgreOdeDebugContact.cpp (added)
• src/ogreode/OgreOdeDebugContact.h (added)
• src/ogreode/OgreOdeDebugObject.cpp (added)
• src/ogreode/OgreOdeDebugObject.h (added)
• src/ogreode/OgreOdeEigenSolver.cpp (added)
• src/ogreode/OgreOdeEigenSolver.h (added)
• src/ogreode/OgreOdeEntityInformer.cpp (added)
• src/ogreode/OgreOdeEntityInformer.h (added)
• src/ogreode/OgreOdeFrameListener.h (added)
• src/ogreode/OgreOdeGeometry.cpp (added)
• src/ogreode/OgreOdeGeometry.h (added)
• src/ogreode/OgreOdeJoint.cpp (added)
• src/ogreode/OgreOdeJoint.h (added)
• src/ogreode/OgreOdeMaintainedList.h (added)
• src/ogreode/OgreOdeMass.cpp (added)
• src/ogreode/OgreOdeMass.h (added)
• src/ogreode/OgreOdePreReqs.h (added)
• src/ogreode/OgreOdePrecompiledHeaders.cpp (added)
• src/ogreode/OgreOdePrecompiledHeaders.h (added)
• src/ogreode/OgreOdeSpace.cpp (added)
• src/ogreode/OgreOdeSpace.h (added)
• src/ogreode/OgreOdeStepper.cpp (added)
• src/ogreode/OgreOdeStepper.h (added)
• src/ogreode/OgreOdeTriangleMeshData.cpp (added)
• src/ogreode/OgreOdeTriangleMeshData.h (added)
• src/ogreode/OgreOdeTriangleMeshDataManager.cpp (added)
• src/ogreode/OgreOdeTriangleMeshDataManager.h (added)
• src/ogreode/OgreOdeUtility.cpp (added)
• src/ogreode/OgreOdeUtility.h (added)
• src/ogreode/OgreOdeWorld.cpp (added)
• src/ogreode/OgreOdeWorld.h (added)
• src/ogreode/OgreOde_Core.h (added)
• src/ogreode/OgreOde_LGPL.txt (added)
• src/ogreode/OgreOde_licence.txt (added)
• visual_studio/vc8/base.vsprops (modified) (2 diffs)
• visual_studio/vc8/ogreode.vcproj (added)
• visual_studio/vc8/ogreode.vsprops (added)
• visual_studio/vc8/orxonox.vsprops (modified) (2 diffs)
• visual_studio/vc8/orxonox_vc8.sln (modified) (5 diffs)

code/branches/physics/src/CMakeLists.txt

@@ -6 +6 @@
 ADD_SUBDIRECTORY(ois)
 ADD_SUBDIRECTORY(tinyxml)
+ADD_SUBDIRECTORY(ogreode)
 ADD_SUBDIRECTORY(lua)
 ADD_SUBDIRECTORY(tolua)

code/branches/physics/visual_studio/vc8/base.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
-                AdditionalIncludeDirectories="&quot;$(RootDir)&quot;;&quot;$(RootDir)src&quot;;&quot;$(RootDir)src\orxonox&quot;;&quot;$(RootDir)src\ceguilua-0.6.1&quot;;&quot;$(LibDir)ogre-1.4.9\include&quot;;&quot;$(LibDir)boost-1.35.0\include&quot;;&quot;$(LibDir)cegui-0.6.1\include&quot;;&quot;$(LibDir)enet-1.2\include&quot;;&quot;$(LibDir)libogg-1.1.3\include&quot;;&quot;$(LibDir)libvorbis-1.2.0\include&quot;;&quot;$(LibDir)openal-1.1\include&quot;;&quot;$(LibDir)freealut-1.1.0\include&quot;;&quot;$(LibDir)tcl-8.5.2\include&quot;;&quot;$(LibDir)zlib-1.2.3\include&quot;"
+                AdditionalIncludeDirectories="&quot;$(RootDir)&quot;;&quot;$(RootDir)src&quot;;&quot;$(RootDir)src\orxonox&quot;;&quot;$(RootDir)src\ceguilua-0.6.1&quot;;&quot;$(LibDir)ogre-1.4.9\include&quot;;&quot;$(LibDir)boost-1.35.0\include&quot;;&quot;$(LibDir)cegui-0.6.1\include&quot;;&quot;$(LibDir)enet-1.2\include&quot;;&quot;$(LibDir)libogg-1.1.3\include&quot;;&quot;$(LibDir)libvorbis-1.2.0\include&quot;;&quot;$(LibDir)openal-1.1\include&quot;;&quot;$(LibDir)freealut-1.1.0\include&quot;;&quot;$(LibDir)tcl-8.5.2\include&quot;;&quot;$(LibDir)zlib-1.2.3\include&quot;;&quot;$(LibDir)ode-0.10.1\include&quot;"
                 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;_WINDOWS;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB;ZLIB_WINAPI"
                 WarningLevel="3"
@@ -21 +21 @@
                 Name="VCLinkerTool"
                 OutputFile="$(OutDir)$(ProjectName)$(CS).dll"
-                AdditionalLibraryDirectories="&quot;$(LibDir)boost-1.35.0\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)cegui-0.6.1\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)enet-1.2\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)freealut-1.1.0\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)libogg-1.1.3\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)libvorbis-1.2.0\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)ogre-1.4.9\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)openal-1.1\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)tcl-8.5.2\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)zlib-1.2.3\lib\$(ConfigurationName)&quot;"
+                AdditionalLibraryDirectories="&quot;$(LibDir)boost-1.35.0\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)cegui-0.6.1\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)enet-1.2\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)freealut-1.1.0\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)libogg-1.1.3\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)libvorbis-1.2.0\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)ode-0.10.1\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)ogre-1.4.9\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)openal-1.1\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)tcl-8.5.2\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)zlib-1.2.3\lib\$(ConfigurationName)&quot;"
                 SubSystem="1"
                 ImportLibrary="$(IntDir)\$(TargetName).lib"

code/branches/physics/visual_studio/vc8/orxonox.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
-                AdditionalOptions="/MP2"
+                AdditionalOptions="/MP2 /Zm200"
                 PreprocessorDefinitions="ORXONOX_NO_EXPORTS;NETWORK_STATIC_BUILD;LUA_BUILD_AS_DLL"
                 UsePrecompiledHeader="2"
@@ -22 +22 @@
                 Name="VCPostBuildEventTool"
                 Description="Copying files from init folder..."
-                CommandLine="for %%a in ($(RootDir)\init\$(SolutionName)\$(ConfigurationName)\*) do replace %%a $(OutDir). /A &gt;nul&#x0D;&#x0A;for %%a in ($(RootDir)\init\common\*) do replace %%a $(OutDir). /A &gt;nul"
+                CommandLine="for %%a in ($(RootDir)\init\$(SolutionName)\$(ConfigurationName)\*) do replace %%a $(OutDir). /A &gt;nul&#x0D;&#x0A;for %%a in ($(RootDir)\init\common\*) do replace %%a $(OutDir). /A &gt;nul&#x0D;&#x0A;"
         />
 </VisualStudioPropertySheet>

code/branches/physics/visual_studio/vc8/orxonox_vc8.sln

@@ -142 +142 @@
         EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogreode", "ogreode.vcproj", "{BBA88DC2-CD78-4C00-814B-183899090F3E}"
+        ProjectSection(WebsiteProperties) = preProject
+                Debug.AspNetCompiler.Debug = "True"
+                Release.AspNetCompiler.Debug = "False"
+        EndProjectSection
+EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -148 +154 @@
         EndGlobalSection
         GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.ActiveCfg = Debug|Win32
+                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.Build.0 = Debug|Win32
+                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.ActiveCfg = Release|Win32
+                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.Build.0 = Release|Win32
                 {53C56131-E2AA-4A27-B460-7AC05D61A0E6}.Debug|Win32.ActiveCfg = Debug|Win32
                 {53C56131-E2AA-4A27-B460-7AC05D61A0E6}.Debug|Win32.Build.0 = Debug|Win32
@@ -184 +194 @@
                 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Release|Win32.ActiveCfg = Release|Win32
                 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Release|Win32.Build.0 = Release|Win32
-                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.ActiveCfg = Debug|Win32
-                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.Build.0 = Debug|Win32
-                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.ActiveCfg = Release|Win32
-                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.Build.0 = Release|Win32
                 {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Debug|Win32.ActiveCfg = Debug|Win32
                 {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Debug|Win32.Build.0 = Debug|Win32
@@ -208 +214 @@
                 {8F5B7ED0-D380-4B4F-A744-3A568718176C}.Release|Win32.ActiveCfg = Release|Win32
                 {8F5B7ED0-D380-4B4F-A744-3A568718176C}.Release|Win32.Build.0 = Release|Win32
+                {BBA88DC2-CD78-4C00-814B-183899090F3E}.Debug|Win32.ActiveCfg = Debug|Win32
+                {BBA88DC2-CD78-4C00-814B-183899090F3E}.Debug|Win32.Build.0 = Debug|Win32
+                {BBA88DC2-CD78-4C00-814B-183899090F3E}.Release|Win32.ActiveCfg = Release|Win32
+                {BBA88DC2-CD78-4C00-814B-183899090F3E}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
@@ -223 +233 @@
                 {C6692661-9160-49E6-B109-A155F9485402} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
                 {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
+                {BBA88DC2-CD78-4C00-814B-183899090F3E} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
         EndGlobalSection
 EndGlobal