Merge branch 'next' of git://gitorious.org/fg/simgear into next

[simgear.git] / projects / VC90 / SimGear.vcproj

diff --git a/projects/VC90/SimGear.vcproj b/projects/VC90/SimGear.vcproj
index fca9e9938a5701b7577e07ac8f173547523250dd..144b512352f9e5f4f48daa604829df570dd219e4 100644 (file)
--- a/projects/VC90/SimGear.vcproj
+++ b/projects/VC90/SimGear.vcproj
@@ -46,8 +46,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..;..\..\simgear;..\..\..;..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\3rdparty\include;..\..\..\boost_1_39_0"\r
-                               PreprocessorDefinitions="HAVE_CONFIG_H,NDEBUG,WIN32;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..;..\..\simgear;..\..\..;..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\3rdparty\include;..\..\..\boost_1_44_0"\r
+                               PreprocessorDefinitions="HAVE_CONFIG_H,NDEBUG,WIN32;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MULTI_INDEX_DISABLE_SERIALIZATION;BOOST_BIMAP_DISABLE_SERIALIZATION"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
@@ -117,8 +117,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..;..\..\simgear;..\..\..;..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\3rdparty.x64\include;..\..\..\boost_1_39_0"\r
-                               PreprocessorDefinitions="HAVE_CONFIG_H,NDEBUG,WIN32;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..;..\..\simgear;..\..\..;..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\3rdparty.x64\include;..\..\..\boost_1_44_0"\r
+                               PreprocessorDefinitions="HAVE_CONFIG_H;NDEBUG;WIN32;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MULTI_INDEX_DISABLE_SERIALIZATION;BOOST_BIMAP_DISABLE_SERIALIZATION"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
@@ -187,8 +187,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\simgear;..\..\..;..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\3rdparty\include;..\..\..\boost_1_39_0"\r
-                               PreprocessorDefinitions="HAVE_CONFIG_H,_DEBUG,WIN32;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..;..\..\simgear;..\..\..;..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\3rdparty\include;..\..\..\boost_1_44_0"\r
+                               PreprocessorDefinitions="HAVE_CONFIG_H,_DEBUG,WIN32;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MULTI_INDEX_DISABLE_SERIALIZATION;BOOST_BIMAP_DISABLE_SERIALIZATION"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                RuntimeTypeInfo="true"\r
@@ -258,8 +258,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\simgear;..\..\..;..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\3rdparty.x64\include;..\..\..\boost_1_39_0"\r
-                               PreprocessorDefinitions="HAVE_CONFIG_H,_DEBUG,WIN32;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..;..\..\simgear;..\..\..;..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\3rdparty.x64\include;..\..\..\boost_1_44_0"\r
+                               PreprocessorDefinitions="HAVE_CONFIG_H,_DEBUG,WIN32;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MULTI_INDEX_DISABLE_SERIALIZATION;BOOST_BIMAP_DISABLE_SERIALIZATION"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                RuntimeTypeInfo="true"\r
@@ -479,6 +479,30 @@
                                RelativePath="..\..\simgear\io\sg_file.hxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\io\sg_netBuffer.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\io\sg_netBuffer.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\io\sg_netChannel.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\io\sg_netChannel.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\io\sg_netChat.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\io\sg_netChat.hxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\simgear\io\sg_serial.cxx"\r
                                >\r
@@ -503,12 +527,6 @@
                                RelativePath="..\..\simgear\io\sg_socket_udp.hxx"\r
                                >\r
                        </File>\r
-                       <File RelativePath="..\..\simgear\io\sg_netChannel.hxx"></File>\r
-                       <File RelativePath="..\..\simgear\io\sg_netChannel.cxx"></File>\r
-                       <File RelativePath="..\..\simgear\io\sg_netChat.hxx"></File>\r
-                       <File RelativePath="..\..\simgear\io\sg_netChat.cxx"></File>\r
-                       <File RelativePath="..\..\simgear\io\sg_netBuffer.cxx"></File>\r
-                       <File RelativePath="..\..\simgear\io\sg_netBuffer.hxx"></File>\r
                </Filter>\r
                <Filter\r
                        Name="Lib_sgmagvar"\r
@@ -649,6 +667,14 @@
                                RelativePath="..\..\simgear\misc\sg_path.hxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\misc\sg_sleep.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\misc\sg_sleep.hxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\simgear\misc\sgstream.cxx"\r
                                >\r
@@ -981,6 +1007,18 @@
                                RelativePath="..\..\simgear\props\ExtendedPropertyAdapter.hxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\props\propertyObject.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\props\propertyObject.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\props\tiedpropertylist.hxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\simgear\props\props.cxx"\r
                                >\r
@@ -1017,6 +1055,14 @@
                                RelativePath="..\..\simgear\scene\model\CheckSceneryVisitor.hxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\scene\model\ConditionNode.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\scene\model\ConditionNode.hxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\simgear\scene\model\model.cxx"\r
                                >\r
@@ -1413,6 +1459,18 @@
                                RelativePath="..\..\simgear\scene\tgdb\userdata.hxx"\r
                                >\r
                        </File>\r
+               </Filter>
+               <Filter\r
+                       Name="Lib_sgtsync"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\simgear\scene\tsync\terrasync.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\scene\tsync\terrasync.hxx"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Lib_sgthread"\r
@@ -1699,14 +1757,6 @@
                                RelativePath="..\..\simgear\environment\precipitation.hxx"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\simgear\environment\visual_enviro.cxx"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\simgear\environment\visual_enviro.hxx"\r
-                               >\r
-                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Lib_sgutil"\r