From 3fb8b7e6790bff107d3e9751d4be5fc149d31e61 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Mon, 10 May 2010 08:34:47 +0200 Subject: [PATCH] Update project to use VC100 OSG and Boost 1.42.0 --- projects/VC100/.gitignore | 1 + projects/VC100/FlightGear/FlightGear.vcxproj | 21 +++++++++++--------- projects/VC100/GPSsmooth/GPSsmooth.vcxproj | 11 +++++----- projects/VC100/MIDGsmooth/MIDGsmooth.vcxproj | 11 +++++----- projects/VC100/UGsmooth/UGsmooth.vcxproj | 11 +++++----- projects/VC100/fgadmin/fgadmin.vcxproj | 11 +++++----- projects/VC100/fgjs/fgjs.vcxproj | 19 +++++++++--------- projects/VC100/fgviewer/fgviewer.vcxproj | 17 ++++++++-------- projects/VC100/metar/metar.vcxproj | 5 ++--- projects/VC100/terrasync/terrasync.vcxproj | 17 ++++++++-------- projects/VC100/yasim/yasim.vcxproj | 17 ++++++++-------- 11 files changed, 69 insertions(+), 72 deletions(-) diff --git a/projects/VC100/.gitignore b/projects/VC100/.gitignore index 477e410ee..994d77bf7 100644 --- a/projects/VC100/.gitignore +++ b/projects/VC100/.gitignore @@ -5,3 +5,4 @@ Win32 x64 ipch *.user +*.sln.cache diff --git a/projects/VC100/FlightGear/FlightGear.vcxproj b/projects/VC100/FlightGear/FlightGear.vcxproj index 4f94c7613..fed1f7f33 100644 --- a/projects/VC100/FlightGear/FlightGear.vcxproj +++ b/projects/VC100/FlightGear/FlightGear.vcxproj @@ -89,6 +89,10 @@ AllRules.ruleset + fgfs + fgfs + fgfs + fgfs @@ -96,7 +100,7 @@ Disabled - ..\..\..\src;..\..\..\src\include;..\..\..\..\SimGear;..\..\..\src\FDM\JSBSim;..\..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_39_0;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\src\include;..\..\..\..\SimGear;..\..\..\src\FDM\JSBSim;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_42_0;%(AdditionalIncludeDirectories) _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;ENABLE_ATCDCL;%(PreprocessorDefinitions) true Default @@ -117,7 +121,7 @@ opengl32.lib;glu32.lib;winmm.lib;wsock32.lib;sg_d.lib;net_d.lib;pui_d.lib;puaux_d.lib;fnt_d.lib;js_d.lib;ul_d.lib;zlibd.lib;OpenAL32.lib;ALut.lib;osgd.lib;osgDBd.lib;osgUtild.lib;osgViewerd.lib;osgGAd.lib;osgTextd.lib;osgParticled.lib;OpenThreadsd.lib;libjpegd.lib;%(AdditionalDependencies) $(OutDir)fgfs.exe true - ..\..\..\..\install\msvc90\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) + ..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -133,7 +137,7 @@ Disabled - ..\..\..\src;..\..\..\src\include;..\..\..\..\SimGear;..\..\..\src\FDM\JSBSim;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_39_0;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\src\include;..\..\..\..\SimGear;..\..\..\src\FDM\JSBSim;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_42_0;%(AdditionalIncludeDirectories) _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;ENABLE_ATCDCL;%(PreprocessorDefinitions) true Default @@ -153,7 +157,7 @@ opengl32.lib;glu32.lib;winmm.lib;wsock32.lib;sg_d.lib;net_d.lib;pui_d.lib;puaux_d.lib;fnt_d.lib;js_d.lib;ul_d.lib;zlibd.lib;OpenAL32.lib;ALut.lib;osgd.lib;osgDBd.lib;osgUtild.lib;osgViewerd.lib;osgGAd.lib;osgTextd.lib;osgParticled.lib;OpenThreadsd.lib;libjpegd.lib;%(AdditionalDependencies) $(OutDir)fgfs.exe true - ..\..\..\..\install\msvc90-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) + ..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -205,7 +209,7 @@ OnlyExplicitInline - ..\..\..\src;..\..\..\src\include;..\..\..\src\FDM\JSBSim;..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_39_0;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\src\include;..\..\..\src\FDM\JSBSim;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_42_0;%(AdditionalIncludeDirectories) 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;ENABLE_ATCDCL;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -224,7 +228,7 @@ opengl32.lib;glu32.lib;winmm.lib;wsock32.lib;sg.lib;net.lib;pui.lib;puAux.lib;fnt.lib;js.lib;ul.lib;zlib.lib;OpenAL32.lib;ALut.lib;osg.lib;osgDB.lib;osgUtil.lib;osgViewer.lib;osgGA.lib;osgText.lib;osgParticle.lib;OpenThreads.lib;libjpeg.lib;%(AdditionalDependencies) $(OutDir)fgfs.exe true - ..\..\..\..\install\msvc90-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) + ..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -1198,9 +1202,8 @@ - - {49142eaf-b264-4b9f-b096-f669999ebb2e} - false + + {22540cd3-d3ca-4c86-a773-80aeee3acded} diff --git a/projects/VC100/GPSsmooth/GPSsmooth.vcxproj b/projects/VC100/GPSsmooth/GPSsmooth.vcxproj index dc3fec300..4a4c9339b 100644 --- a/projects/VC100/GPSsmooth/GPSsmooth.vcxproj +++ b/projects/VC100/GPSsmooth/GPSsmooth.vcxproj @@ -90,7 +90,7 @@ Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -118,7 +118,7 @@ Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -168,7 +168,7 @@ X64 - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -197,9 +197,8 @@ - - {ae9ce7e4-8f21-4c34-82dd-4d0371c210da} - false + + {22540cd3-d3ca-4c86-a773-80aeee3acded} diff --git a/projects/VC100/MIDGsmooth/MIDGsmooth.vcxproj b/projects/VC100/MIDGsmooth/MIDGsmooth.vcxproj index fadf4a5bb..98fb7f69c 100644 --- a/projects/VC100/MIDGsmooth/MIDGsmooth.vcxproj +++ b/projects/VC100/MIDGsmooth/MIDGsmooth.vcxproj @@ -89,7 +89,7 @@ Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -118,7 +118,7 @@ Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -170,7 +170,7 @@ X64 - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -200,9 +200,8 @@ - - {92010fab-17a3-4891-ae6d-507214fea508} - false + + {22540cd3-d3ca-4c86-a773-80aeee3acded} diff --git a/projects/VC100/UGsmooth/UGsmooth.vcxproj b/projects/VC100/UGsmooth/UGsmooth.vcxproj index 40d695d42..6229f50be 100644 --- a/projects/VC100/UGsmooth/UGsmooth.vcxproj +++ b/projects/VC100/UGsmooth/UGsmooth.vcxproj @@ -89,7 +89,7 @@ Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_39_0;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_42_0;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -118,7 +118,7 @@ Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_39_0;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_42_0;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -170,7 +170,7 @@ X64 - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_39_0;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_42_0;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -205,9 +205,8 @@ - - {eeeeb798-bffd-425f-86f9-03c6fe6b8b99} - false + + {22540cd3-d3ca-4c86-a773-80aeee3acded} diff --git a/projects/VC100/fgadmin/fgadmin.vcxproj b/projects/VC100/fgadmin/fgadmin.vcxproj index a1584817a..38441c179 100644 --- a/projects/VC100/fgadmin/fgadmin.vcxproj +++ b/projects/VC100/fgadmin/fgadmin.vcxproj @@ -89,7 +89,7 @@ Disabled - ..\..\..\..\SimGear;..\..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) + ..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;HAVE_ZLIB;NOMINMAX;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -117,7 +117,7 @@ Disabled - ..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) + ..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;HAVE_ZLIB;NOMINMAX;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -176,7 +176,7 @@ MaxSpeed OnlyExplicitInline true - ..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) + ..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;HAVE_ZLIB;NOMINMAX;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -219,9 +219,8 @@ - - {7004e589-7ea0-4afd-b432-3d5e00b55049} - false + + {22540cd3-d3ca-4c86-a773-80aeee3acded} diff --git a/projects/VC100/fgjs/fgjs.vcxproj b/projects/VC100/fgjs/fgjs.vcxproj index e6cf9d32d..d634ff702 100644 --- a/projects/VC100/fgjs/fgjs.vcxproj +++ b/projects/VC100/fgjs/fgjs.vcxproj @@ -90,7 +90,7 @@ Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_39_0;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_42_0;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -103,7 +103,7 @@ sg_d.lib;js_d.lib;ul_d.lib;zlibd.lib;winmm.lib;ws2_32.lib;OpenThreadsd.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc90\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) + ..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) true $(OutDir)fgjs.pdb Console @@ -119,7 +119,7 @@ Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_39_0;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_42_0;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -132,7 +132,7 @@ sg_d.lib;js_d.lib;ul_d.lib;zlibd.lib;winmm.lib;ws2_32.lib;OpenThreadsd.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc90-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) + ..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) true $(OutDir)fgjs.pdb Console @@ -165,13 +165,15 @@ MachineX86 + + X64 - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_39_0;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_42_0;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -182,7 +184,7 @@ sg.lib;js.lib;ul.lib;zlib.lib;winmm.lib;ws2_32.lib;OpenThreads.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc90-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) + ..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) true Console true @@ -203,9 +205,8 @@ - - {6749547a-6493-4754-8e0e-49fb3137c4ca} - false + + {22540cd3-d3ca-4c86-a773-80aeee3acded} diff --git a/projects/VC100/fgviewer/fgviewer.vcxproj b/projects/VC100/fgviewer/fgviewer.vcxproj index 7ea7efe1f..0d1289e1a 100644 --- a/projects/VC100/fgviewer/fgviewer.vcxproj +++ b/projects/VC100/fgviewer/fgviewer.vcxproj @@ -89,7 +89,7 @@ Disabled - ..\..\..\..\SimGear;..\..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\..\boost_1_39_0;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) + ..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\boost_1_42_0;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions) true EnableFastChecks @@ -102,7 +102,7 @@ opengl32.lib;osgd.lib;osgDBd.lib;osgViewerd.lib;osgGAd.lib;openthreadsd.lib;osgParticled.lib;osgUtild.lib;osgTextd.lib;ul_d.lib;sg_d.lib;zlibd.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc90\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) + ..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) true $(OutDir)fgviewer.pdb Console @@ -118,7 +118,7 @@ Disabled - ..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\boost_1_39_0;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) + ..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\boost_1_42_0;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions) true EnableFastChecks @@ -131,7 +131,7 @@ opengl32.lib;osgd.lib;osgDBd.lib;osgViewerd.lib;osgGAd.lib;openthreadsd.lib;osgParticled.lib;osgUtild.lib;osgTextd.lib;ul_d.lib;sg_d.lib;zlibd.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc90-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) + ..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) true $(OutDir)fgviewer.pdb Console @@ -170,7 +170,7 @@ X64 - ..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\boost_1_39_0;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) + ..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\boost_1_42_0;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -181,7 +181,7 @@ opengl32.lib;osg.lib;osgDB.lib;osgViewer.lib;osgGA.lib;openthreads.lib;osgParticle.lib;osgUtil.lib;osgText.lib;ul.lib;sg.lib;zlib.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc90-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) + ..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) true Console true @@ -196,9 +196,8 @@ - - {0f13a557-ec52-481d-adfb-9209c068fceb} - false + + {22540cd3-d3ca-4c86-a773-80aeee3acded} diff --git a/projects/VC100/metar/metar.vcxproj b/projects/VC100/metar/metar.vcxproj index 244b07d47..4a5ffee15 100644 --- a/projects/VC100/metar/metar.vcxproj +++ b/projects/VC100/metar/metar.vcxproj @@ -192,9 +192,8 @@ - - {fc424099-5d77-4bc2-a93f-2ee59f816b51} - false + + {22540cd3-d3ca-4c86-a773-80aeee3acded} diff --git a/projects/VC100/terrasync/terrasync.vcxproj b/projects/VC100/terrasync/terrasync.vcxproj index b3da0cf43..9a6973f7e 100644 --- a/projects/VC100/terrasync/terrasync.vcxproj +++ b/projects/VC100/terrasync/terrasync.vcxproj @@ -89,7 +89,7 @@ Disabled - ..\..\..\..\SimGear;..\..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) + ..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;NOMINMAX;HAVE_SVN_CLIENT_H;HAVE_LIBSVN_CLIENT_1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -102,7 +102,7 @@ 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;%(AdditionalDependencies) - ..\..\..\..\install\msvc90\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) + ..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) true $(OutDir)terrasync.pdb Console @@ -118,7 +118,7 @@ Disabled - ..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) + ..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;NOMINMAX;HAVE_SVN_CLIENT_H;HAVE_LIBSVN_CLIENT_1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -131,7 +131,7 @@ 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;%(AdditionalDependencies) - ..\..\..\..\install\msvc90-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) + ..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) true $(OutDir)terrasync.pdb Console @@ -170,7 +170,7 @@ X64 - ..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) + ..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;NOMINMAX;HAVE_SVN_CLIENT_H;HAVE_LIBSVN_CLIENT_1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -181,7 +181,7 @@ 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;%(AdditionalDependencies) - ..\..\..\..\install\msvc90-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) + ..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) true Console true @@ -196,9 +196,8 @@ - - {874d3f55-6048-4068-a7c2-7fa6af1f30ea} - false + + {22540cd3-d3ca-4c86-a773-80aeee3acded} diff --git a/projects/VC100/yasim/yasim.vcxproj b/projects/VC100/yasim/yasim.vcxproj index 752ed5f97..30023aee4 100644 --- a/projects/VC100/yasim/yasim.vcxproj +++ b/projects/VC100/yasim/yasim.vcxproj @@ -89,7 +89,7 @@ Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_39_0;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_42_0;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -102,7 +102,7 @@ sg_d.lib;ul_d.lib;OpenThreadsd.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc90\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) + ..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) true $(OutDir)yasim.pdb Console @@ -118,7 +118,7 @@ Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_39_0;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_42_0;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -131,7 +131,7 @@ sg_d.lib;ul_d.lib;OpenThreadsd.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc90-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) + ..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) true $(OutDir)yasim.pdb Console @@ -170,7 +170,7 @@ X64 - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_39_0;%(AdditionalIncludeDirectories) + ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_42_0;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -181,7 +181,7 @@ sg.lib;ul.lib;OpenThreads.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc90-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) + ..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) true Console true @@ -250,9 +250,8 @@ - - {800cb1ff-c398-4b81-b3d6-8bbd9e0897d2} - false + + {22540cd3-d3ca-4c86-a773-80aeee3acded} -- 2.39.2