Update MSVC 7.1 projects - Put PLIB and FLTK in 3rdParty

diff --git a/projects/VC7.1/FlightGear.sln b/projects/VC7.1/FlightGear.sln
index 2d449fa8410eaa82d73973779029ac9cc8345eac..4c9261002d9468e1abadfeb4f92a7af23be8914c 100755 (executable)
--- a/projects/VC7.1/FlightGear.sln
+++ b/projects/VC7.1/FlightGear.sln
@@ -10,7 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimGear", "..\..\..\SimGear
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgadmin", "fgadmin.vcproj", "{7004E589-7EA0-4AFD-B432-3D5E00B55049}"
        ProjectSection(ProjectDependencies) = postProject
-               {49142EAF-B264-4B9F-B096-F669999EBB2E} = {49142EAF-B264-4B9F-B096-F669999EBB2E}
                {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}
        EndProjectSection
 EndProject

diff --git a/projects/VC7.1/FlightGear.vcproj b/projects/VC7.1/FlightGear.vcproj
index f4c414f741271f59140ea268623ebeb7a1987ae6..317a3a6b2778e8a6771986b93a8da795c70eb0a1 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;..\..\src\FDM\JSBSim;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdParty\include;..\..\..\boost_1_36_0"
+                               AdditionalIncludeDirectories="..\..\src;..\..\src\include;..\..\..\SimGear;..\..\src\FDM\JSBSim;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdParty\include;..\..\..\boost_1_36_0"
                                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;PU_USE_NATIVE"
                                StringPooling="TRUE"
                                BasicRuntimeChecks="0"
@@ -47,7 +47,7 @@
                                OutputFile="$(OutDir)/fgfs.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\3rdParty\lib"
                                IgnoreDefaultLibraryNames=""
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile=".\Debug/FlightGear.pdb"
@@ -87,7 +87,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..;..\..\src;..\..\src\include;..\..\src\FDM\JSBSim;..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\Producer\include;..\..\..\3rdParty\include;..\..\..\boost_1_36_0"
+                               AdditionalIncludeDirectories="..\..\src;..\..\src\include;..\..\src\FDM\JSBSim;..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\Producer\include;..\..\..\3rdParty\include;..\..\..\boost_1_36_0"
                                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;PU_USE_NATIVE"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
@@ -110,7 +110,7 @@
                                OutputFile="bin/Release/fgfs.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\3rdParty\lib"
                                IgnoreDefaultLibraryNames=""
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile=".\Release/FlightGear.pdb"

diff --git a/projects/VC7.1/GPSsmooth.vcproj b/projects/VC7.1/GPSsmooth.vcproj
index f0d783088e01369d04fe03d448510789ec141718..e3774ce411d4043a0d10fb69c9a98fa96d6dd1e9 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;..\..\..\install\msvc71\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"
@@ -36,7 +36,7 @@
                                AdditionalDependencies="sg_d.lib net_d.lib ul_d.lib ws2_32.lib winmm.lib zlibd.lib"
                                OutputFile="$(OutDir)/GPSsmooth.exe"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="..\..\..\plib;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/GPSsmooth.pdb"
                                SubSystem="1"
@@ -70,7 +70,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\install\msvc71\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"
@@ -84,7 +84,7 @@
                                AdditionalDependencies="sg.lib net.lib ul.lib ws2_32.lib winmm.lib zlib.lib"
                                OutputFile="bin/Release/GPSsmooth.exe"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="..\..\..\plib;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"

diff --git a/projects/VC7.1/MIDGsmooth.vcproj b/projects/VC7.1/MIDGsmooth.vcproj
index 8ab9a12ad48a6772d78f0b6cf4f5cf8e8135ba19..7c7371d03a8eb43a047af14fa1a1105d83148dc2 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;..\..\..\install\msvc71\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"
@@ -36,7 +36,7 @@
                                AdditionalDependencies="sg_d.lib net_d.lib ul_d.lib ws2_32.lib winmm.lib"
                                OutputFile="$(OutDir)/MIDGsmooth.exe"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="..\..\..\plib"
+                               AdditionalLibraryDirectories="..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/MIDGsmooth.pdb"
                                SubSystem="1"
@@ -70,7 +70,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\install\msvc71\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"
@@ -85,7 +85,7 @@
                                AdditionalDependencies="sg.lib net.lib ul.lib ws2_32.lib winmm.lib"
                                OutputFile="bin/Release/MIDGsmooth.exe"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="..\..\..\plib"
+                               AdditionalLibraryDirectories="..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"

diff --git a/projects/VC7.1/UGsmooth.vcproj b/projects/VC7.1/UGsmooth.vcproj
index a357f30dc55ae2502d450b0da86284fcf73bb1a9..21d2a081e7aea336d72b511019bc58f3986c8cd7 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;..\..\..\install\msvc71\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"
@@ -36,7 +36,7 @@
                                AdditionalDependencies="sg_d.lib net_d.lib ul_d.lib ws2_32.lib winmm.lib zlibd.lib"
                                OutputFile="$(OutDir)/UGsmooth.exe"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="..\..\..\plib;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/UGsmooth.pdb"
                                SubSystem="1"
@@ -70,7 +70,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\install\msvc71\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"
@@ -85,7 +85,7 @@
                                AdditionalDependencies="sg.lib net.lib ul.lib ws2_32.lib winmm.lib zlib.lib"
                                OutputFile="bin/Release/UGsmooth.exe"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="..\..\..\plib;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"

diff --git a/projects/VC7.1/fgadmin.vcproj b/projects/VC7.1/fgadmin.vcproj
index aced56579527752cb8b6d35789d24958b160b431..3b51c19a9695510faa6ba29f509e2b840d05d54e 100755 (executable)
--- a/projects/VC7.1/fgadmin.vcproj
+++ b/projects/VC7.1/fgadmin.vcproj
@@ -19,11 +19,12 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="&quot;..\..\..\fltk-1.1.7&quot;;..\..\..;..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\..\..\OpenThreads\include;..\..\..\3rdParty\include"
+                               AdditionalIncludeDirectories="..\..\..\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"
                                RuntimeLibrary="3"
+                               RuntimeTypeInfo="TRUE"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="TRUE"
@@ -35,7 +36,7 @@
                                AdditionalDependencies="fltkd.lib ul_d.lib comctl32.lib wsock32.lib zlibd.lib sg_d.lib"
                                OutputFile="$(OutDir)/fgadmin.exe"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="&quot;..\..\..\fltk-1.1.7\lib&quot;;..\..\..\plib;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/fgadmin.pdb"
                                SubSystem="1"
@@ -72,11 +73,12 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                OmitFramePointers="TRUE"
-                               AdditionalIncludeDirectories="&quot;..\..\..\fltk-1.1.7&quot;;..\..\..;..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdParty\include"
+                               AdditionalIncludeDirectories="..\..\..\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"
                                EnableFunctionLevelLinking="TRUE"
+                               RuntimeTypeInfo="TRUE"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="TRUE"

diff --git a/projects/VC7.1/fgjs.vcproj b/projects/VC7.1/fgjs.vcproj
index 6dd620c69f598416493dd51efbf03d88d287414d..e3ef27cef825a72c27b48810dd97405b943f3a28 100755 (executable)
--- a/projects/VC7.1/fgjs.vcproj
+++ b/projects/VC7.1/fgjs.vcproj
@@ -20,7 +20,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..\SimGear;..\..\..;..\..\..\install\msvc71\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"
@@ -37,7 +37,7 @@
                                AdditionalDependencies="sg_d.lib js_d.lib ul_d.lib zlibd.lib winmm.lib ws2_32.lib OpenThreadsd.lib"
                                OutputFile="$(OutDir)/fgjs.exe"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/fgjs.pdb"
                                SubSystem="1"
@@ -71,7 +71,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..\SimGear;..\..\..;..\..\..\install\msvc71\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"
@@ -86,7 +86,7 @@
                                AdditionalDependencies="sg.lib js.lib ul.lib zlib.lib winmm.lib ws2_32.lib OpenThreads.lib"
                                OutputFile="bin/Release/fgjs.exe"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"

diff --git a/projects/VC7.1/fgviewer.vcproj b/projects/VC7.1/fgviewer.vcproj
index f216dc13d1a34fcb301356e3b2a2d9b0eaa5cd98..5bc8a053c0c5ee98c1e0ea090bef1a0a7e21e50e 100755 (executable)
--- a/projects/VC7.1/fgviewer.vcproj
+++ b/projects/VC7.1/fgviewer.vcproj
@@ -19,7 +19,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..;..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\boost_1_36_0"
+                               AdditionalIncludeDirectories="..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\boost_1_36_0"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NOMINMAX"
                                MinimalRebuild="TRUE"
                                BasicRuntimeChecks="3"
@@ -36,7 +36,7 @@
                                AdditionalDependencies="opengl32.lib osgd.lib osgDBd.lib osgViewerd.lib osgGAd.lib openthreadsd.lib osgParticled.lib osgUtild.lib ul_d.lib sg_d.lib zlibd.lib"
                                OutputFile="$(OutDir)/fgviewer.exe"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/fgviewer.pdb"
                                SubSystem="1"
@@ -70,7 +70,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..;..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\boost_1_36_0"
+                               AdditionalIncludeDirectories="..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\boost_1_36_0"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NOMINMAX"
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="TRUE"
@@ -85,7 +85,7 @@
                                AdditionalDependencies="opengl32.lib osg.lib osgDB.lib osgViewer.lib osgGA.lib openthreads.lib osgParticle.lib osgUtil.lib ul.lib sg.lib zlib.lib"
                                OutputFile="bin/Release/fgviewer.exe"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"

diff --git a/projects/VC7.1/metar.vcproj b/projects/VC7.1/metar.vcproj
index b424be46a05a8fa5adf702a0f3ce4632db0ee830..60acf7616b6d764281eccc57e8f543d35f1c2044 100755 (executable)
--- a/projects/VC7.1/metar.vcproj
+++ b/projects/VC7.1/metar.vcproj
@@ -19,7 +19,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\SimGear;..\..\.."
+                               AdditionalIncludeDirectories="..\..\..\SimGear;..\..\..\3rdParty\include"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                MinimalRebuild="TRUE"
                                BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
                                AdditionalDependencies="sg_d.lib ul_d.lib net_d.lib ws2_32.lib"
                                OutputFile="$(OutDir)/metar.exe"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="..\..\..\plib"
+                               AdditionalLibraryDirectories="..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/metar.pdb"
                                SubSystem="1"
@@ -69,7 +69,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\SimGear;..\..\.."
+                               AdditionalIncludeDirectories="..\..\..\SimGear;..\..\..\3rdParty\include"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
@@ -83,7 +83,7 @@
                                AdditionalDependencies="sg.lib ul.lib net.lib ws2_32.lib"
                                OutputFile="bin/Release/metar.exe"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="..\..\..\plib"
+                               AdditionalLibraryDirectories="..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"

diff --git a/projects/VC7.1/terrasync.vcproj b/projects/VC7.1/terrasync.vcproj
index c44a28770fb0cd320c37a079cdfadf389b553f5a..b148b79adc049d7321da96ea7a0c9ea51ab183df 100755 (executable)
--- a/projects/VC7.1/terrasync.vcproj
+++ b/projects/VC7.1/terrasync.vcproj
@@ -19,7 +19,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..;&quot;..\..\..\svn-win32-1.5.3\include&quot;;&quot;..\..\..\svn-win32-1.5.3\include\apr&quot;;&quot;..\..\..\svn-win32-1.5.3\include\apr-iconv&quot;;&quot;..\..\..\svn-win32-1.5.3\include\apr-util&quot;"
+                               AdditionalIncludeDirectories="..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;&quot;..\..\..\svn-win32-1.5.3\include&quot;;&quot;..\..\..\svn-win32-1.5.3\include\apr&quot;;&quot;..\..\..\svn-win32-1.5.3\include\apr-iconv&quot;;&quot;..\..\..\svn-win32-1.5.3\include\apr-util&quot;"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NOMINMAX;HAVE_SVN_CLIENT_H;HAVE_LIBSVN_CLIENT_1"
                                MinimalRebuild="TRUE"
                                BasicRuntimeChecks="3"
@@ -36,7 +36,7 @@
                                AdditionalDependencies="ul_d.lib sg_d.lib net_d.lib ws2_32.lib libsvn_client-1.lib libsvn_diff-1.lib libsvn_delta-1.lib libsvn_ra-1.lib libsvn_subr-1.lib libsvn_wc-1.lib libapr-1.lib OpenThreadsd.lib"
                                OutputFile="$(OutDir)/terrasync.exe"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib;&quot;..\..\..\svn-win32-1.5.3\lib&quot;;&quot;..\..\..\svn-win32-1.5.3\lib\apr&quot;"
+                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;&quot;..\..\..\svn-win32-1.5.3\lib&quot;;&quot;..\..\..\svn-win32-1.5.3\lib\apr&quot;"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/terrasync.pdb"
                                SubSystem="1"
@@ -70,7 +70,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..;&quot;..\..\..\svn-win32-1.5.3\include&quot;;&quot;..\..\..\svn-win32-1.5.3\include\apr&quot;;&quot;..\..\..\svn-win32-1.5.3\include\apr-iconv&quot;;&quot;..\..\..\svn-win32-1.5.3\include\apr-util&quot;"
+                               AdditionalIncludeDirectories="..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;&quot;..\..\..\svn-win32-1.5.3\include&quot;;&quot;..\..\..\svn-win32-1.5.3\include\apr&quot;;&quot;..\..\..\svn-win32-1.5.3\include\apr-iconv&quot;;&quot;..\..\..\svn-win32-1.5.3\include\apr-util&quot;"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NOMINMAX;HAVE_SVN_CLIENT_H;HAVE_LIBSVN_CLIENT_1"
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="TRUE"
@@ -85,7 +85,7 @@
                                AdditionalDependencies="ul.lib sg.lib net.lib ws2_32.lib libsvn_client-1.lib libsvn_diff-1.lib libsvn_delta-1.lib libsvn_ra-1.lib libsvn_subr-1.lib libsvn_wc-1.lib libapr-1.lib OpenThreads.lib"
                                OutputFile="bin/Release/terrasync.exe"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib;&quot;..\..\..\svn-win32-1.5.3\lib&quot;;&quot;..\..\..\svn-win32-1.5.3\lib\apr&quot;"
+                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\3rdParty\lib;&quot;..\..\..\svn-win32-1.5.3\lib&quot;;&quot;..\..\..\svn-win32-1.5.3\lib\apr&quot;"
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"

diff --git a/projects/VC7.1/yasim.vcproj b/projects/VC7.1/yasim.vcproj
index 56311684a0844dfaf46fcbfc6d187b92543a9cb1..a0b26c3954d75df43ce020eb2300f8cf3068327d 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;..\..\..;..\..\..\install\msvc71\OpenSceneGraph\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"
@@ -36,7 +36,7 @@
                                AdditionalDependencies="sg_d.lib ul_d.lib OpenThreadsd.lib"
                                OutputFile="$(OutDir)/yasim.exe"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib"
+                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/yasim.pdb"
                                SubSystem="1"
@@ -70,7 +70,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..\SimGear;..\..\..;..\..\..\install\msvc71\OpenSceneGraph\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"
@@ -85,7 +85,7 @@
                                AdditionalDependencies="sg.lib ul.lib OpenThreads.lib"
                                OutputFile="bin/Release/yasim.exe"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib"
+                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"