Merge branches 'jmt/brakes' and 'jmt/dump'

[flightgear.git] / projects / VC7.1 / fgjs.vcproj

diff --git a/projects/VC7.1/fgjs.vcproj b/projects/VC7.1/fgjs.vcproj
index c5c57fbaa127a86ae79d11e7555da5f5b5e8257b..e3ef27cef825a72c27b48810dd97405b943f3a28 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,11 +20,12 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..\SimGear;..\..\..;..\..\..\OpenSceneGraph\include;..\..\..\OpenThreads\include;..\..\..\3rdParty\include"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NOMINMAX"
+                               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"
                                RuntimeLibrary="3"
+                               RuntimeTypeInfo="TRUE"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="TRUE"
@@ -32,10 +34,10 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sg_d.lib js_d.lib ul_d.lib zlibd.lib winmm.lib ws2_32.lib"
+                               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="..\..\..\plib;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/fgjs.pdb"
                                SubSystem="1"
@@ -69,9 +71,10 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\src;..\..\..\SimGear;..\..\..;..\..\..\OpenSceneGraph\include;..\..\..\OpenThreads\include;..\..\..\3rdParty\include"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NOMINMAX"
+                               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"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="TRUE"
@@ -80,10 +83,10 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sg.lib js.lib ul.lib zlib.lib winmm.lib ws2_32.lib"
-                               OutputFile="$(OutDir)/fgjs.exe"
+                               AdditionalDependencies="sg.lib js.lib ul.lib zlib.lib winmm.lib ws2_32.lib OpenThreads.lib"
+                               OutputFile="bin/Release/fgjs.exe"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="..\..\..\plib;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\3rdParty\lib"
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"