fly/flightgear
1
0
Fork 0
Code Activity

Modified Files:

Browse source 
projects/VC8/FlightGear.vcproj
	projects/VC8/FlightGearLib.vcproj Olaf Flebbe: Updates to the win32
        build system.
This commit is contained in:
frohlich 2007-04-21 12:25:19 +00:00
parent c8986567ae
commit 9271dcdb3f
2 changed files with 49 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
projects/VC8/FlightGear.vcproj
View file

@ -39,11 +39,11 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../../;../../../OpenThreads/include;../../../OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include" AdditionalIncludeDirectories="../../../;$(ProgramFiles)/OpenThreads/include;$(ProgramFiles)/OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;PTW32_STATIC_LIB;OSG_LIBRARY_STATIC;PR_LIBRARY_STATIC;OT_LIBRARY_STATIC;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;NOMINMAX" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;NOMINMAX"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
@ -60,13 +60,13 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="FlightgearLib.lib Simgear.lib fnt.lib js.lib net.lib psl.lib puAux.lib pui.lib pw.lib sg.lib sl.lib ul.lib osgDBd_s.lib osgDB_jpegd_s.lib osgDB_rgbd_s.lib osgDB_acd_s.lib osgdb_txfd_s.lib osgUtild_s.lib osgParticled_s.lib osgTextd_s.lib osgd_s.lib OpenThreadsWin32d_s.lib libjpeg.lib pthreadvc2.lib Alut.lib openal32.lib zlib.lib wsock32.lib advapi32.lib comdlg32.lib shell32.lib user32.lib" AdditionalDependencies="FlightgearLib.lib Simgear.lib fnt.lib js.lib net.lib psl.lib puAux.lib pui.lib pw.lib sg.lib sl.lib ul.lib osgDBd.lib osgUtild.lib osgParticled.lib osgTextd.lib osgd.lib OpenThreadsd.lib libjpeg.lib pthreadvc2.lib Alut.lib openal32.lib zlib.lib wsock32.lib advapi32.lib comdlg32.lib shell32.lib user32.lib"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;../../../OpenThreads/lib/win32;../../../OpenSceneGraph/lib/win32;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../3rdParty/lib" AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;$(ProgramFiles)/OpenThreads/lib;$(ProgramFiles)/OpenSceneGraph/lib;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../3rdParty/lib"
IgnoreDefaultLibraryNames="libcmt.lib" IgnoreDefaultLibraryNames="libcmt.lib"
ForceSymbolReferences="?g_readerWriter_JPEG_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterJPEG@@@osgDB@@A;?g_readerWriter_AC_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterAC@@@osgDB@@A;?g_readerWriter_RGB_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterRGB@@@osgDB@@A;?g_readerWriter_TXF_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterTXF@@@osgDB@@A"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
LargeAddressAware="2"
TargetMachine="1" TargetMachine="1"
FixedBaseAddress="1" FixedBaseAddress="1"
/> />
@ -118,10 +118,10 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../;../../../OpenThreads/include;../../../OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include" AdditionalIncludeDirectories="../../../;$(ProgramFiles)/OpenThreads/include;$(ProgramFiles)/OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PTW32_STATIC_LIB;OSG_LIBRARY_STATIC;PR_LIBRARY_STATIC;OT_LIBRARY_STATIC;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
@ -138,10 +138,9 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="FlightgearLib.lib Simgear.lib fnt.lib js.lib net.lib psl.lib puAux.lib pui.lib pw.lib sg.lib sl.lib ul.lib osgDB_ac_s.lib osgDB_jpeg_s.lib osgDB_rgb_s.lib osgDB_txf_s.lib osgDB_s.lib osgUtil_s.lib osgParticle_s.lib osgText_s.lib osg_s.lib OpenThreadsWin32_s.lib pthreadvc2.lib Alut.lib openal32.lib zlib.lib libjpeg.lib wsock32.lib advapi32.lib comdlg32.lib shell32.lib user32.lib" AdditionalDependencies="FlightgearLib.lib Simgear.lib fnt.lib js.lib net.lib psl.lib puAux.lib pui.lib pw.lib sg.lib sl.lib ul.lib osgDB.lib osgUtil.lib osgParticle.lib osgText.lib osg.lib OpenThreads.lib pthreadvc2.lib Alut.lib openal32.lib zlib1.lib libjpeg.lib wsock32.lib advapi32.lib comdlg32.lib shell32.lib user32.lib"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;../../../OpenThreads/lib/win32;../../../OpenSceneGraph/lib/win32;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../3rdParty/lib;$(NOINHERIT)" AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;$(ProgramFiles)/OpenThreads/lib;$(ProgramFiles)/OpenSceneGraph/lib;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../3rdParty/lib;$(NOINHERIT)"
ForceSymbolReferences="?g_readerWriter_JPEG_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterJPEG@@@osgDB@@A;?g_readerWriter_AC_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterAC@@@osgDB@@A;?g_readerWriter_RGB_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterRGB@@@osgDB@@A;?g_readerWriter_TXF_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterTXF@@@osgDB@@A"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
OptimizeReferences="2" OptimizeReferences="2"
@ -299,6 +298,14 @@
RelativePath="..\..\src\main\splash.cxx" RelativePath="..\..\src\main\splash.cxx"
> >
</File> </File>
<File
RelativePath="..\..\..\..\Memory_and_Exception_Trace\Stackwalker.cpp"
>
</File>
<File
RelativePath="..\..\..\..\Memory_and_Exception_Trace\Stackwalker.h"
>
</File>
<File <File
RelativePath="..\..\src\main\util.cxx" RelativePath="..\..\src\main\util.cxx"
> >

46
projects/VC8/FlightGearLib.vcproj
View file

@ -41,12 +41,12 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../../;../../../OpenThreads/include;../../../OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include" AdditionalIncludeDirectories="../../../;$(ProgramFiles)/OpenThreads/include;$(ProgramFiles)/OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;PTW32_STATIC_LIB;PR_LIBRARY_STATIC;OSG_LIBRARY_STATIC;OT_LIBRARY_STATIC;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX"
StringPooling="true" StringPooling="true"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
@ -105,11 +105,11 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../;../../../OpenThreads/include;../../../OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include" AdditionalIncludeDirectories="../../../;$(ProgramFiles)/OpenThreads/include;$(ProgramFiles)/OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PTW32_STATIC_LIB;PR_LIBRARY_STATIC;OSG_LIBRARY_STATIC;OT_LIBRARY_STATIC;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX"
StringPooling="true" StringPooling="true"
MinimalRebuild="false" MinimalRebuild="false"
RuntimeLibrary="0" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
@ -857,11 +857,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\cockpit\hud.hxx" RelativePath="..\..\src\Instrumentation\HUD\HUD.hxx"
> >
</File> </File>
<File <File
RelativePath="..\..\src\Instrumentation\HUD\HUD.hxx" RelativePath="..\..\src\cockpit\hud.hxx"
> >
</File> </File>
<File <File
@ -1916,10 +1916,6 @@
RelativePath="..\..\src\instrumentation\altimeter.cxx" RelativePath="..\..\src\instrumentation\altimeter.cxx"
> >
</File> </File>
<File
RelativePath="..\..\src\instrumentation\annunciator.cxx"
>
</File>
<File <File
RelativePath="..\..\src\atc\approach.cxx" RelativePath="..\..\src\atc\approach.cxx"
> >
@ -1984,6 +1980,28 @@
RelativePath="..\..\src\fdm\yasim\Atmosphere.cpp" RelativePath="..\..\src\fdm\yasim\Atmosphere.cpp"
> >
</File> </File>
<File
RelativePath="..\..\src\Environment\atmosphere.cxx"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\..\src\instrumentation\attitude_indicator.cxx" RelativePath="..\..\src\instrumentation\attitude_indicator.cxx"
> >
@ -2100,10 +2118,6 @@
RelativePath="..\..\src\systems\electrical.cxx" RelativePath="..\..\src\systems\electrical.cxx"
> >
</File> </File>
<File
RelativePath="..\..\src\instrumentation\encoder.cxx"
>
</File>
<File <File
RelativePath="..\..\src\environment\environment.cxx" RelativePath="..\..\src\environment\environment.cxx"
> >