Changeset 2459 for code/branches/presentation/visual_studio
- Timestamp:
- Dec 15, 2008, 12:53:05 AM (16 years ago)
- Location:
- code/branches/presentation
- Files:
-
- 22 edited
- 9 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/audio.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/audio.vsprops (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/audio.vsprops (added) merged: 2442
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/base.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/base.vsprops (added) merged: 1919,1986,2124,2192 /code/branches/physics_merge/visual_studio/vc8/base.vsprops (added) merged: 2442
r2420 r2459 8 8 <Tool 9 9 Name="VCCLCompilerTool" 10 AdditionalIncludeDirectories=""$(RootDir) ";"$(RootDir)src";"$(RootDir)src\orxonox";"$(RootDir)src\ceguilua-0.6.1";"$(LibDir)ogre-1.4.9\include";"$(LibDir)boost-1.35.0\include";"$(LibDir)cegui-0.6.1\include";"$(LibDir)enet-1.2\include";"$(LibDir)libogg-1.1.3\include";"$(LibDir)libvorbis-1.2.0\include";"$(LibDir)openal-1.1\include";"$(LibDir)freealut-1.1.0\include";"$(LibDir)tcl-8.5.2\include";"$(LibDir)zlib-1.2.3\include""10 AdditionalIncludeDirectories=""$(RootDir)src";"$(RootDir)src\ceguilua-0.6.1";"$(RootDir)src\bullet";"$(LibDir)ogre-1.4.9\include";"$(LibDir)boost-1.35.0\include";"$(LibDir)cegui-0.6.1\include";"$(LibDir)enet-1.2\include";"$(LibDir)libogg-1.1.3\include";"$(LibDir)libvorbis-1.2.0\include";"$(LibDir)openal-1.1\include";"$(LibDir)freealut-1.1.0\include";"$(LibDir)tcl-8.5.2\include";"$(LibDir)zlib-1.2.3\include"" 11 11 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;_WINDOWS;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB;ZLIB_WINAPI" 12 12 WarningLevel="3" - Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/ceguilua.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/ceguilua.vsprops (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/ceguilua.vsprops (added) merged: 2442
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/core.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/core.vsprops (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/core.vsprops (added) merged: 2442
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/cpptcl.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/cpptcl.vsprops (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/cpptcl.vsprops (added) merged: 2442
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/debug.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/debug.vsprops (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/debug.vsprops (added) merged: 2442
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/directories.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/directories.vsprops (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/directories.vsprops (added) merged: 2442-2443
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/lua.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/lua.vsprops (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/lua.vsprops (added) merged: 2442
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/network.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/network.vsprops (added) merged: 1987,2192 /code/branches/physics_merge/visual_studio/vc8/network.vsprops (added) merged: 2442
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/orxonox.vcproj
r2435 r2459 289 289 </File> 290 290 <File 291 RelativePath="..\..\src\orxonox\objects\worldentities\MobileEntity.cc" 292 > 293 </File> 294 <File 291 295 RelativePath="..\..\src\orxonox\objects\worldentities\Model.cc" 292 296 > … … 309 313 </File> 310 314 <File 311 RelativePath="..\..\src\orxonox\objects\worldentities\PositionableEntity.cc"312 >313 </File>314 <File315 315 RelativePath="..\..\src\orxonox\objects\worldentities\SpawnPoint.cc" 316 > 317 </File> 318 <File 319 RelativePath="..\..\src\orxonox\objects\worldentities\StaticEntity.cc" 316 320 > 317 321 </File> … … 621 625 </File> 622 626 </Filter> 627 <Filter 628 Name="collisionShapes" 629 > 630 <File 631 RelativePath="..\..\src\orxonox\objects\collisionshapes\CollisionShape.cc" 632 > 633 </File> 634 <File 635 RelativePath="..\..\src\orxonox\objects\collisionshapes\CompoundCollisionShape.cc" 636 > 637 </File> 638 <File 639 RelativePath="..\..\src\orxonox\objects\collisionshapes\PlaneCollisionShape.cc" 640 > 641 </File> 642 <File 643 RelativePath="..\..\src\orxonox\objects\collisionshapes\SphereCollisionShape.cc" 644 > 645 </File> 646 </Filter> 623 647 </Filter> 624 648 <Filter … … 949 973 </File> 950 974 <File 975 RelativePath="..\..\src\orxonox\objects\worldentities\MobileEntity.h" 976 > 977 </File> 978 <File 951 979 RelativePath="..\..\src\orxonox\objects\worldentities\Model.h" 952 980 > … … 969 997 </File> 970 998 <File 971 RelativePath="..\..\src\orxonox\objects\worldentities\PositionableEntity.h"972 >973 </File>974 <File975 999 RelativePath="..\..\src\orxonox\objects\worldentities\SpawnPoint.h" 1000 > 1001 </File> 1002 <File 1003 RelativePath="..\..\src\orxonox\objects\worldentities\StaticEntity.h" 976 1004 > 977 1005 </File> … … 1181 1209 </Filter> 1182 1210 </Filter> 1211 <Filter 1212 Name="collisionShapes" 1213 > 1214 <File 1215 RelativePath="..\..\src\orxonox\objects\collisionshapes\CollisionShape.h" 1216 > 1217 </File> 1218 <File 1219 RelativePath="..\..\src\orxonox\objects\collisionshapes\CompoundCollisionShape.h" 1220 > 1221 </File> 1222 <File 1223 RelativePath="..\..\src\orxonox\objects\collisionshapes\PlaneCollisionShape.h" 1224 > 1225 </File> 1226 <File 1227 RelativePath="..\..\src\orxonox\objects\collisionshapes\SphereCollisionShape.h" 1228 > 1229 </File> 1230 </Filter> 1183 1231 </Filter> 1184 1232 <Filter … … 1187 1235 <File 1188 1236 RelativePath="..\..\src\orxonox\tools\BillboardSet.h" 1237 > 1238 </File> 1239 <File 1240 RelativePath="..\..\src\orxonox\tools\BulletConversions.h" 1189 1241 > 1190 1242 </File> -
code/branches/presentation/visual_studio/vc8/orxonox.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/orxonox.vsprops (added) merged: 1919,1986,2192 /code/branches/physics_merge/visual_studio/vc8/orxonox.vsprops (added) merged: 2442
r2420 r2459 9 9 Name="VCCLCompilerTool" 10 10 AdditionalOptions="/MP2 /Zm200" 11 AdditionalIncludeDirectories="$(RootDir)src\orxonox" 11 12 PreprocessorDefinitions="ORXONOX_NO_EXPORTS;ORXONOX_ENABLE_PCH;LUA_BUILD_AS_DLL" 12 13 UsePrecompiledHeader="2" - Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/orxonox_vc8.sln
- Property svn:mergeinfo changed
r2420 r2459 8 8 EndProjectSection 9 9 ProjectSection(ProjectDependencies) = postProject 10 {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} 10 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68} 11 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F} 12 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 11 13 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F} 12 14 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 13 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 14 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68} 15 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497} 16 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F} 15 {C8659D22-3CB7-41C9-A1BC-B40DB70A31A5} = {C8659D22-3CB7-41C9-A1BC-B40DB70A31A5} 16 {41481057-47FD-4BEF-853B-7EF5F975F05E} = {41481057-47FD-4BEF-853B-7EF5F975F05E} 17 {BA753941-F455-43A2-925C-7F3E02F6A995} = {BA753941-F455-43A2-925C-7F3E02F6A995} 18 {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} 19 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} 17 20 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 21 EndProjectSection 22 EndProject 23 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpptcl", "cpptcl.vcproj", "{53C56131-E2AA-4A27-B460-7AC05D61A0E6}" 24 ProjectSection(WebsiteProperties) = preProject 25 Debug.AspNetCompiler.Debug = "True" 26 Release.AspNetCompiler.Debug = "False" 27 EndProjectSection 28 EndProject 29 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "tinyxml.vcproj", "{F101C2F0-1CB9-4A57-827B-6C399A99B28F}" 30 ProjectSection(WebsiteProperties) = preProject 31 Debug.AspNetCompiler.Debug = "True" 32 Release.AspNetCompiler.Debug = "False" 33 EndProjectSection 34 EndProject 35 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua", "tolua.vcproj", "{35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}" 36 ProjectSection(WebsiteProperties) = preProject 37 Debug.AspNetCompiler.Debug = "True" 38 Release.AspNetCompiler.Debug = "False" 39 EndProjectSection 40 ProjectSection(ProjectDependencies) = postProject 41 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F} 42 EndProjectSection 43 EndProject 44 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluagen_orxonox", "toluagen_orxonox.vcproj", "{71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}" 45 ProjectSection(WebsiteProperties) = preProject 46 Debug.AspNetCompiler.Debug = "True" 47 Release.AspNetCompiler.Debug = "False" 48 EndProjectSection 49 ProjectSection(ProjectDependencies) = postProject 50 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34} 51 {C6692661-9160-49E6-B109-A155F9485402} = {C6692661-9160-49E6-B109-A155F9485402} 52 {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {8F5B7ED0-D380-4B4F-A744-3A568718176C} 53 EndProjectSection 54 EndProject 55 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluagen", "toluagen.vcproj", "{A0724246-CB7C-420B-BCF0-68EF205AFE34}" 56 ProjectSection(WebsiteProperties) = preProject 57 Debug.AspNetCompiler.Debug = "True" 58 Release.AspNetCompiler.Debug = "False" 59 EndProjectSection 60 ProjectSection(ProjectDependencies) = postProject 61 {C6692661-9160-49E6-B109-A155F9485402} = {C6692661-9160-49E6-B109-A155F9485402} 62 {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {8F5B7ED0-D380-4B4F-A744-3A568718176C} 63 EndProjectSection 64 EndProject 65 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util.vcproj", "{2240ECD7-2F48-4431-8E1B-25466A384CCC}" 66 ProjectSection(WebsiteProperties) = preProject 67 Debug.AspNetCompiler.Debug = "True" 68 Release.AspNetCompiler.Debug = "False" 69 EndProjectSection 70 EndProject 71 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core.vcproj", "{271715F3-5B90-4110-A552-70C788084A86}" 72 ProjectSection(WebsiteProperties) = preProject 73 Debug.AspNetCompiler.Debug = "True" 74 Release.AspNetCompiler.Debug = "False" 75 EndProjectSection 76 ProjectSection(ProjectDependencies) = postProject 18 77 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} 19 EndProjectSection 20 EndProject 21 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpptcl", "cpptcl.vcproj", "{53C56131-E2AA-4A27-B460-7AC05D61A0E6}" 22 ProjectSection(WebsiteProperties) = preProject 23 Debug.AspNetCompiler.Debug = "True" 24 Release.AspNetCompiler.Debug = "False" 25 EndProjectSection 26 EndProject 27 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "tinyxml.vcproj", "{F101C2F0-1CB9-4A57-827B-6C399A99B28F}" 28 ProjectSection(WebsiteProperties) = preProject 29 Debug.AspNetCompiler.Debug = "True" 30 Release.AspNetCompiler.Debug = "False" 31 EndProjectSection 32 EndProject 33 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua", "tolua.vcproj", "{35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}" 34 ProjectSection(WebsiteProperties) = preProject 35 Debug.AspNetCompiler.Debug = "True" 36 Release.AspNetCompiler.Debug = "False" 37 EndProjectSection 38 ProjectSection(ProjectDependencies) = postProject 39 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F} 40 EndProjectSection 41 EndProject 42 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluagen_orxonox", "toluagen_orxonox.vcproj", "{71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}" 43 ProjectSection(WebsiteProperties) = preProject 44 Debug.AspNetCompiler.Debug = "True" 45 Release.AspNetCompiler.Debug = "False" 46 EndProjectSection 47 ProjectSection(ProjectDependencies) = postProject 48 {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {8F5B7ED0-D380-4B4F-A744-3A568718176C} 49 {C6692661-9160-49E6-B109-A155F9485402} = {C6692661-9160-49E6-B109-A155F9485402} 50 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34} 51 EndProjectSection 52 EndProject 53 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluagen", "toluagen.vcproj", "{A0724246-CB7C-420B-BCF0-68EF205AFE34}" 54 ProjectSection(WebsiteProperties) = preProject 55 Debug.AspNetCompiler.Debug = "True" 56 Release.AspNetCompiler.Debug = "False" 57 EndProjectSection 58 ProjectSection(ProjectDependencies) = postProject 59 {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {8F5B7ED0-D380-4B4F-A744-3A568718176C} 60 {C6692661-9160-49E6-B109-A155F9485402} = {C6692661-9160-49E6-B109-A155F9485402} 61 EndProjectSection 62 EndProject 63 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util.vcproj", "{2240ECD7-2F48-4431-8E1B-25466A384CCC}" 64 ProjectSection(WebsiteProperties) = preProject 65 Debug.AspNetCompiler.Debug = "True" 66 Release.AspNetCompiler.Debug = "False" 67 EndProjectSection 68 EndProject 69 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core.vcproj", "{271715F3-5B90-4110-A552-70C788084A86}" 70 ProjectSection(WebsiteProperties) = preProject 71 Debug.AspNetCompiler.Debug = "True" 72 Release.AspNetCompiler.Debug = "False" 73 EndProjectSection 74 ProjectSection(ProjectDependencies) = postProject 78 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F} 79 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 80 {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6} 81 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 82 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F} 75 83 {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} = {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} 76 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F} 77 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 78 {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6} 84 EndProjectSection 85 EndProject 86 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "audio.vcproj", "{4733BD1A-E04C-458D-8BFB-5010250EA497}" 87 ProjectSection(WebsiteProperties) = preProject 88 Debug.AspNetCompiler.Debug = "True" 89 Release.AspNetCompiler.Debug = "False" 90 EndProjectSection 91 ProjectSection(ProjectDependencies) = postProject 92 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 93 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 94 EndProjectSection 95 EndProject 96 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "network", "network.vcproj", "{35575B59-E1AE-40E8-89C4-2862B5B09B68}" 97 ProjectSection(WebsiteProperties) = preProject 98 Debug.AspNetCompiler.Debug = "True" 99 Release.AspNetCompiler.Debug = "False" 100 EndProjectSection 101 ProjectSection(ProjectDependencies) = postProject 102 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 103 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 104 EndProjectSection 105 EndProject 106 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua.vcproj", "{63B3E57A-4382-42F3-85EC-E869CFCCA88F}" 107 ProjectSection(WebsiteProperties) = preProject 108 Debug.AspNetCompiler.Debug = "True" 109 Release.AspNetCompiler.Debug = "False" 110 EndProjectSection 111 EndProject 112 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ceguilua", "ceguilua.vcproj", "{4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}" 113 ProjectSection(WebsiteProperties) = preProject 114 Debug.AspNetCompiler.Debug = "True" 115 Release.AspNetCompiler.Debug = "False" 116 EndProjectSection 117 ProjectSection(ProjectDependencies) = postProject 118 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F} 79 119 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 80 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}81 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}82 EndProjectSection83 EndProject84 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "audio.vcproj", "{4733BD1A-E04C-458D-8BFB-5010250EA497}"85 ProjectSection(WebsiteProperties) = preProject86 Debug.AspNetCompiler.Debug = "True"87 Release.AspNetCompiler.Debug = "False"88 EndProjectSection89 ProjectSection(ProjectDependencies) = postProject90 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}91 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}92 EndProjectSection93 EndProject94 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "network", "network.vcproj", "{35575B59-E1AE-40E8-89C4-2862B5B09B68}"95 ProjectSection(WebsiteProperties) = preProject96 Debug.AspNetCompiler.Debug = "True"97 Release.AspNetCompiler.Debug = "False"98 EndProjectSection99 ProjectSection(ProjectDependencies) = postProject100 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}101 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}102 EndProjectSection103 EndProject104 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua.vcproj", "{63B3E57A-4382-42F3-85EC-E869CFCCA88F}"105 ProjectSection(WebsiteProperties) = preProject106 Debug.AspNetCompiler.Debug = "True"107 Release.AspNetCompiler.Debug = "False"108 EndProjectSection109 EndProject110 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ceguilua", "ceguilua.vcproj", "{4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}"111 ProjectSection(WebsiteProperties) = preProject112 Debug.AspNetCompiler.Debug = "True"113 Release.AspNetCompiler.Debug = "False"114 EndProjectSection115 ProjectSection(ProjectDependencies) = postProject116 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}117 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}118 120 EndProjectSection 119 121 EndProject … … 137 139 EndProject 138 140 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua_static", "lua_static.vcproj", "{8F5B7ED0-D380-4B4F-A744-3A568718176C}" 141 ProjectSection(WebsiteProperties) = preProject 142 Debug.AspNetCompiler.Debug = "True" 143 Release.AspNetCompiler.Debug = "False" 144 EndProjectSection 145 EndProject 146 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bullet_collision", "bullet_collision.vcproj", "{BA753941-F455-43A2-925C-7F3E02F6A995}" 147 ProjectSection(WebsiteProperties) = preProject 148 Debug.AspNetCompiler.Debug = "True" 149 Release.AspNetCompiler.Debug = "False" 150 EndProjectSection 151 EndProject 152 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bullet_dynamics", "bullet_dynamics.vcproj", "{41481057-47FD-4BEF-853B-7EF5F975F05E}" 153 ProjectSection(WebsiteProperties) = preProject 154 Debug.AspNetCompiler.Debug = "True" 155 Release.AspNetCompiler.Debug = "False" 156 EndProjectSection 157 EndProject 158 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bullet_linearmath", "bullet_linearmath.vcproj", "{C8659D22-3CB7-41C9-A1BC-B40DB70A31A5}" 139 159 ProjectSection(WebsiteProperties) = preProject 140 160 Debug.AspNetCompiler.Debug = "True" … … 148 168 EndGlobalSection 149 169 GlobalSection(ProjectConfigurationPlatforms) = postSolution 170 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.ActiveCfg = Debug|Win32 171 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.Build.0 = Debug|Win32 172 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.ActiveCfg = Release|Win32 173 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.Build.0 = Release|Win32 150 174 {53C56131-E2AA-4A27-B460-7AC05D61A0E6}.Debug|Win32.ActiveCfg = Debug|Win32 151 175 {53C56131-E2AA-4A27-B460-7AC05D61A0E6}.Debug|Win32.Build.0 = Debug|Win32 … … 177 201 {271715F3-5B90-4110-A552-70C788084A86}.Release|Win32.Build.0 = Release|Win32 178 202 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Debug|Win32.ActiveCfg = Debug|Win32 179 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Debug|Win32.Build.0 = Debug|Win32180 203 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Release|Win32.ActiveCfg = Release|Win32 181 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Release|Win32.Build.0 = Release|Win32182 204 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Debug|Win32.ActiveCfg = Debug|Win32 183 205 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Debug|Win32.Build.0 = Debug|Win32 184 206 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Release|Win32.ActiveCfg = Release|Win32 185 207 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Release|Win32.Build.0 = Release|Win32 186 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.ActiveCfg = Debug|Win32187 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.Build.0 = Debug|Win32188 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.ActiveCfg = Release|Win32189 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.Build.0 = Release|Win32190 208 {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Debug|Win32.ActiveCfg = Debug|Win32 191 209 {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Debug|Win32.Build.0 = Debug|Win32 … … 208 226 {8F5B7ED0-D380-4B4F-A744-3A568718176C}.Release|Win32.ActiveCfg = Release|Win32 209 227 {8F5B7ED0-D380-4B4F-A744-3A568718176C}.Release|Win32.Build.0 = Release|Win32 228 {BA753941-F455-43A2-925C-7F3E02F6A995}.Debug|Win32.ActiveCfg = Debug|Win32 229 {BA753941-F455-43A2-925C-7F3E02F6A995}.Debug|Win32.Build.0 = Debug|Win32 230 {BA753941-F455-43A2-925C-7F3E02F6A995}.Release|Win32.ActiveCfg = Release|Win32 231 {BA753941-F455-43A2-925C-7F3E02F6A995}.Release|Win32.Build.0 = Release|Win32 232 {41481057-47FD-4BEF-853B-7EF5F975F05E}.Debug|Win32.ActiveCfg = Debug|Win32 233 {41481057-47FD-4BEF-853B-7EF5F975F05E}.Debug|Win32.Build.0 = Debug|Win32 234 {41481057-47FD-4BEF-853B-7EF5F975F05E}.Release|Win32.ActiveCfg = Release|Win32 235 {41481057-47FD-4BEF-853B-7EF5F975F05E}.Release|Win32.Build.0 = Release|Win32 236 {C8659D22-3CB7-41C9-A1BC-B40DB70A31A5}.Debug|Win32.ActiveCfg = Debug|Win32 237 {C8659D22-3CB7-41C9-A1BC-B40DB70A31A5}.Debug|Win32.Build.0 = Debug|Win32 238 {C8659D22-3CB7-41C9-A1BC-B40DB70A31A5}.Release|Win32.ActiveCfg = Release|Win32 239 {C8659D22-3CB7-41C9-A1BC-B40DB70A31A5}.Release|Win32.Build.0 = Release|Win32 210 240 EndGlobalSection 211 241 GlobalSection(SolutionProperties) = preSolution … … 223 253 {C6692661-9160-49E6-B109-A155F9485402} = {B9D56701-B4DB-43F8-9920-241CA418C1CE} 224 254 {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {B9D56701-B4DB-43F8-9920-241CA418C1CE} 255 {BA753941-F455-43A2-925C-7F3E02F6A995} = {B9D56701-B4DB-43F8-9920-241CA418C1CE} 256 {41481057-47FD-4BEF-853B-7EF5F975F05E} = {B9D56701-B4DB-43F8-9920-241CA418C1CE} 257 {C8659D22-3CB7-41C9-A1BC-B40DB70A31A5} = {B9D56701-B4DB-43F8-9920-241CA418C1CE} 225 258 EndGlobalSection 226 259 EndGlobal -
code/branches/presentation/visual_studio/vc8/release.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/release.vsprops (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/release.vsprops (added) merged: 2442
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/tinyxml.vcproj
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/tinyxml.vcproj (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/tinyxml.vcproj (added) merged: 2442
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/tinyxml.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/tinyxml.vsprops (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/tinyxml.vsprops (added) merged: 2442
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/tolua.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/tolua.vsprops (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/tolua.vsprops (added) merged: 2442
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/toluagen.vcproj
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/toluagen.vcproj (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/toluagen.vcproj (added) merged: 2442
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/toluagen.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/toluagen.vsprops (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/toluagen.vsprops (added) merged: 2442
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vcproj
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/toluagen_orxonox.vcproj (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/toluagen_orxonox.vcproj (added) merged: 2442
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/toluagen_orxonox.vsprops (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/toluagen_orxonox.vsprops (added) merged: 2442
- Property svn:mergeinfo changed
-
code/branches/presentation/visual_studio/vc8/util.vsprops
- Property svn:mergeinfo changed
/code/branches/physics/visual_studio/vc8/util.vsprops (added) merged: 2192 /code/branches/physics_merge/visual_studio/vc8/util.vsprops (added) merged: 2442
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.