Update MSVC 7.1 projects - Adapt to OSG 2.6.0-rc1 : location of header files should...

3dconvert not built anymore. Use osgconv

diff --git a/projects/VC7.1/FlightGear.sln b/projects/VC7.1/FlightGear.sln
index 44eb4604d5a53cc168facb1ff219c34704513657..e9c8d317f1838611b3fde367744e76222a9e8f56 100755 (executable)
--- a/projects/VC7.1/FlightGear.sln
+++ b/projects/VC7.1/FlightGear.sln
@@ -14,11 +14,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgadmin", "fgadmin.vcproj",
                {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3dconvert", "3dconvert.vcproj", "{D95DBC85-D945-4879-B6CF-5864BF8F5E2E}"
-       ProjectSection(ProjectDependencies) = postProject
-               {49142EAF-B264-4B9F-B096-F669999EBB2E} = {49142EAF-B264-4B9F-B096-F669999EBB2E}
-       EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgjs", "fgjs.vcproj", "{6749547A-6493-4754-8E0E-49FB3137C4CA}"
        ProjectSection(ProjectDependencies) = postProject
                {49142EAF-B264-4B9F-B096-F669999EBB2E} = {49142EAF-B264-4B9F-B096-F669999EBB2E}
@@ -67,10 +62,6 @@ Global
                {7004E589-7EA0-4AFD-B432-3D5E00B55049}.Debug.Build.0 = Debug|Win32
                {7004E589-7EA0-4AFD-B432-3D5E00B55049}.Release.ActiveCfg = Release|Win32
                {7004E589-7EA0-4AFD-B432-3D5E00B55049}.Release.Build.0 = Release|Win32
-               {D95DBC85-D945-4879-B6CF-5864BF8F5E2E}.Debug.ActiveCfg = Debug|Win32
-               {D95DBC85-D945-4879-B6CF-5864BF8F5E2E}.Debug.Build.0 = Debug|Win32
-               {D95DBC85-D945-4879-B6CF-5864BF8F5E2E}.Release.ActiveCfg = Release|Win32
-               {D95DBC85-D945-4879-B6CF-5864BF8F5E2E}.Release.Build.0 = Release|Win32
                {6749547A-6493-4754-8E0E-49FB3137C4CA}.Debug.ActiveCfg = Debug|Win32
                {6749547A-6493-4754-8E0E-49FB3137C4CA}.Debug.Build.0 = Debug|Win32
                {6749547A-6493-4754-8E0E-49FB3137C4CA}.Release.ActiveCfg = Release|Win32

diff --git a/projects/VC7.1/FlightGear.vcproj b/projects/VC7.1/FlightGear.vcproj
index 76c4f40cdaed96ae7c928d5af50657257dfdb467..af536f5387d7930697185f4b36bfb9125e57cb18 100755 (executable)
--- a/projects/VC7.1/FlightGear.vcproj
+++ b/projects/VC7.1/FlightGear.vcproj
@@ -23,7 +23,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..;..\..\src;..\..\src\include;..\..\..\SimGear;&quot;..\..\..\pthreads-w32-2-7-0-release&quot;;..\..\src\FDM\JSBSim;..\..\..\OpenSceneGraph\include;..\..\..\OpenThreads\include;..\..\..\3rdParty\include"
+                               AdditionalIncludeDirectories="..\..\..;..\..\src;..\..\src\include;..\..\..\SimGear;&quot;..\..\..\pthreads-w32-2-7-0-release&quot;;..\..\src\FDM\JSBSim;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdParty\include"
                                PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                StringPooling="TRUE"
                                BasicRuntimeChecks="0"
@@ -87,7 +87,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..;..\..\src;..\..\src\include;..\..\src\FDM\JSBSim;..\..\..\SimGear;&quot;..\..\..\pthreads-w32-2-7-0-release&quot;;..\..\..\OpenSceneGraph\include;..\..\..\Producer\include;..\..\..\OpenThreads\include;..\..\..\3rdParty\include"
+                               AdditionalIncludeDirectories="..\..\..;..\..\src;..\..\src\include;..\..\src\FDM\JSBSim;..\..\..\SimGear;&quot;..\..\..\pthreads-w32-2-7-0-release&quot;;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\Producer\include;..\..\..\3rdParty\include"
                                PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
@@ -1816,6 +1816,12 @@
                        <File
                                RelativePath="..\..\src\Main\bootstrap.cxx">
                        </File>
+                       <File
+                               RelativePath="..\..\src\Main\CameraGroup.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Main\CameraGroup.hxx">
+                       </File>
                        <File
                                RelativePath="..\..\src\Main\fg_commands.cxx">
                        </File>
@@ -1924,6 +1930,12 @@
                        <File
                                RelativePath="..\..\src\Main\ViewPartitionNode.hxx">
                        </File>
+                       <File
+                               RelativePath="..\..\src\Main\WindowBuilder.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Main\WindowBuilder.hxx">
+                       </File>
                        <File
                                RelativePath="..\..\src\Main\WindowSystemAdapter.cxx">
                        </File>

diff --git a/projects/VC7.1/GPSsmooth.vcproj b/projects/VC7.1/GPSsmooth.vcproj
index cc3287361dd616131e0a35193506068d30ff783d..13af128fc2e1cfe8d1020b645d37c932126ec41e 100755 (executable)
--- a/projects/VC7.1/GPSsmooth.vcproj
+++ b/projects/VC7.1/GPSsmooth.vcproj
@@ -20,7 +20,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\OpenSceneGraph\include;..\..\..\3rdParty\include"
+                               AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdParty\include"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                MinimalRebuild="TRUE"
                                BasicRuntimeChecks="3"
@@ -70,7 +70,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\OpenSceneGraph\include;..\..\..\3rdParty\include"
+                               AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdParty\include"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"

diff --git a/projects/VC7.1/MIDGsmooth.vcproj b/projects/VC7.1/MIDGsmooth.vcproj
index 5ce28129a2f176a679e001063a1e72699120171d..9b3361958392b98fbffd1713ac044bcb2391e322 100755 (executable)
--- a/projects/VC7.1/MIDGsmooth.vcproj
+++ b/projects/VC7.1/MIDGsmooth.vcproj
@@ -19,7 +19,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\OpenSceneGraph\include;..\..\..\3rdParty\include"
+                               AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdParty\include"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                MinimalRebuild="TRUE"
                                BasicRuntimeChecks="3"
@@ -70,7 +70,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\OpenSceneGraph\include;..\..\..\3rdParty\include"
+                               AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdParty\include"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="TRUE"

diff --git a/projects/VC7.1/UGsmooth.vcproj b/projects/VC7.1/UGsmooth.vcproj
index 7413b807555ee3a5b04fceaf1c91db527b286d56..2e67d82ebf1b9ae54dfdc4747cdd5b81b40b57d0 100755 (executable)
--- a/projects/VC7.1/UGsmooth.vcproj
+++ b/projects/VC7.1/UGsmooth.vcproj
@@ -19,7 +19,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\OpenSceneGraph\include;..\..\..\3rdParty\include"
+                               AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdParty\include"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                MinimalRebuild="TRUE"
                                BasicRuntimeChecks="3"
@@ -70,7 +70,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\OpenSceneGraph\include;..\..\..\3rdParty\include"
+                               AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdParty\include"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="TRUE"

diff --git a/projects/VC7.1/fgadmin.vcproj b/projects/VC7.1/fgadmin.vcproj
index e50aa59045295dd14c6b072c05e9ed9cd0aef136..0706a4e13b5c1772b83d3d802e189881a938df62 100755 (executable)
--- a/projects/VC7.1/fgadmin.vcproj
+++ b/projects/VC7.1/fgadmin.vcproj
@@ -19,7 +19,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="&quot;..\..\..\fltk-1.1.7&quot;;..\..\..;..\..\..\SimGear;..\..\..\OpenSceneGraph\include;..\..\..\..\..\OpenThreads\include;..\..\..\3rdParty\include"
+                               AdditionalIncludeDirectories="&quot;..\..\..\fltk-1.1.7&quot;;..\..\..;..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\..\..\OpenThreads\include;..\..\..\3rdParty\include"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_ZLIB;NOMINMAX;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                MinimalRebuild="TRUE"
                                BasicRuntimeChecks="3"
@@ -72,7 +72,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                OmitFramePointers="TRUE"
-                               AdditionalIncludeDirectories="&quot;..\..\..\fltk-1.1.7&quot;;..\..\..;..\..\..\SimGear;..\..\..\OpenSceneGraph\include;..\..\..\3rdParty\include"
+                               AdditionalIncludeDirectories="&quot;..\..\..\fltk-1.1.7&quot;;..\..\..;..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdParty\include"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_ZLIB;NOMINMAX;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"

diff --git a/projects/VC7.1/fgjs.vcproj b/projects/VC7.1/fgjs.vcproj
index 574c79fe42f2d9751c0621f2804e01869debee13..95bff1b6f481998f089f2858bcbc4f0a73380a29 100755 (executable)
--- a/projects/VC7.1/fgjs.vcproj
+++ b/projects/VC7.1/fgjs.vcproj
@@ -4,6 +4,7 @@
        Version="7.10"
        Name="fgjs"
        ProjectGUID="{6749547A-6493-4754-8E0E-49FB3137C4CA}"
+       RootNamespace="fgjs"
        Keyword="Win32Proj">
        <Platforms>
                <Platform
@@ -19,7 +20,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..\SimGear;..\..\..;..\..\..\OpenSceneGraph\include;..\..\..\OpenThreads\include;..\..\..\3rdParty\include"
+                               AdditionalIncludeDirectories="..\..\src;..\..\..\SimGear;..\..\..;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdParty\include"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                MinimalRebuild="TRUE"
                                BasicRuntimeChecks="3"
@@ -69,7 +70,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..\SimGear;..\..\..;..\..\..\OpenSceneGraph\include;..\..\..\OpenThreads\include;..\..\..\3rdParty\include"
+                               AdditionalIncludeDirectories="..\..\src;..\..\..\SimGear;..\..\..;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdParty\include"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"

diff --git a/projects/VC7.1/yasim.vcproj b/projects/VC7.1/yasim.vcproj
index 435c26bdbee0356ae91f886ff6d17e96496b7014..3da2f6c82b160c0fcd4b0fb12b762d8d40b0f59f 100755 (executable)
--- a/projects/VC7.1/yasim.vcproj
+++ b/projects/VC7.1/yasim.vcproj
@@ -19,7 +19,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..\SimGear;..\..\..;..\..\..\OpenSceneGraph\include;..\..\..\OpenThreads\include"
+                               AdditionalIncludeDirectories="..\..\src;..\..\..\SimGear;..\..\..;..\..\..\install\msvc71\OpenSceneGraph\include"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                MinimalRebuild="TRUE"
                                BasicRuntimeChecks="3"
@@ -70,7 +70,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..\SimGear;..\..\..;..\..\..\OpenSceneGraph\include;..\..\..\OpenThreads\include"
+                               AdditionalIncludeDirectories="..\..\src;..\..\..\SimGear;..\..\..;..\..\..\install\msvc71\OpenSceneGraph\include"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="TRUE"