From ede9a03d070243c514450ceff3cfb2a59242f854 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Fri, 28 Jan 2011 14:57:32 +0100 Subject: [PATCH 01/16] Cmake: support VS2010 and MSVC 64 bit --- CMakeLists.txt | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9505c6480..0e1c46fe2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,7 @@ option(ENABLE_FGADMIN "Set to ON to build FlightGear with FGADMIN" ON) option(EVENT_INPUT "Set to ON to build FlightGear with event-based Input support" OFF) option(ENABLE_LIBSVN "Set to ON to build terrasync with libsvnclient support" OFF) -set(MSVC_3RDPARTY_DIR NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted") +set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted") if(LOGGING) # nothing @@ -82,15 +82,28 @@ else(EVENT_INPUT) set(ENABLE_PLIB_JOYSTICK 1) endif(EVENT_INPUT) -if (MSVC_3RDPARTY_DIR) - message(STATUS "3rdparty files located in ${MSVC_3RDPARTY_DIR}") - set (CMAKE_LIBRARY_PATH ${MSVC_3RDPARTY_DIR}/3rdParty/lib ${MSVC_3RDPARTY_DIR}/install/msvc90/OpenScenegraph/lib ${MSVC_3RDPARTY_DIR}/install/msvc90/SimGear/lib ) - set (CMAKE_INCLUDE_PATH ${MSVC_3RDPARTY_DIR}/3rdParty/include ${MSVC_3RDPARTY_DIR}/install/msvc90/OpenScenegraph/include ${MSVC_3RDPARTY_DIR}/install/msvc90/SimGear/include) - set (BOOST_ROOT ${MSVC_3RDPARTY_DIR}/boost_1_44_0) - set (OPENAL_INCLUDE_DIR ${MSVC_3RDPARTY_DIR}/3rdParty/include) - set (ALUT_INCLUDE_DIR ${MSVC_3RDPARTY_DIR}/3rdParty/include) - set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_DIR}/3rdParty/lib) -endif (MSVC_3RDPARTY_DIR) +if (MSVC AND MSVC_3RDPARTY_ROOT) + message(STATUS "3rdparty files located in ${MSVC_3RDPARTY_ROOT}") + set( OSG_MSVC "msvc" ) + if (${MSVC_VERSION} EQUAL 1600) + set( OSG_MSVC ${OSG_MSVC}100 ) + else (${MSVC_VERSION} EQUAL 1600) + set( OSG_MSVC ${OSG_MSVC}90 ) + endif (${MSVC_VERSION} EQUAL 1600) + if (CMAKE_CL_64) + set( OSG_MSVC ${OSG_MSVC}-64 ) + set( MSVC_3RDPARTY_DIR 3rdParty.x64 ) + else (CMAKE_CL_64) + set( MSVC_3RDPARTY_DIR 3rdParty ) + endif (CMAKE_CL_64) + + set (CMAKE_LIBRARY_PATH ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenScenegraph/lib ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/SimGear/lib ) + set (CMAKE_INCLUDE_PATH ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenScenegraph/include ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/SimGear/include) + set (BOOST_ROOT ${MSVC_3RDPARTY_ROOT}/boost_1_44_0) + set (OPENAL_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include) + set (ALUT_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include) + set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib) +endif (MSVC AND MSVC_3RDPARTY_ROOT) # check required dependencies From 0baa517b33b2e5384e5088236364aee9cc9f6a1f Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Fri, 28 Jan 2011 15:15:20 +0100 Subject: [PATCH 02/16] Cmake: fix VS2010 link --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e1c46fe2..1ec1f627e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,6 +194,9 @@ if(WIN32) # endforeach(warning) set(MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS") + if (${MSVC_VERSION} EQUAL 1600) + set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" ) + endif (${MSVC_VERSION} EQUAL 1600) endif(MSVC) set(NOMINMAX 1) @@ -202,6 +205,7 @@ endif(WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS} ${MSVC_FLAGS} -D_REENTRANT") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} ${MSVC_FLAGS} -D_REENTRANT") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}") include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} From 2317b3bf053c96f40b0f84073e7006aab7a69aa8 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Fri, 28 Jan 2011 19:00:28 +0100 Subject: [PATCH 03/16] Deprecate VS2010 handmade project files now that we have Cmake --- projects/VC100/.gitignore | 8 - projects/VC100/FlightGear.sln | 163 - projects/VC100/FlightGear/FlightGear.vcxproj | 1429 -------- .../FlightGear/FlightGear.vcxproj.filters | 2939 ----------------- projects/VC100/GPSsmooth/GPSsmooth.vcxproj | 208 -- .../VC100/GPSsmooth/GPSsmooth.vcxproj.filters | 30 - projects/VC100/MIDGsmooth/MIDGsmooth.vcxproj | 211 -- .../MIDGsmooth/MIDGsmooth.vcxproj.filters | 30 - projects/VC100/README | 2 + projects/VC100/UGsmooth/UGsmooth.vcxproj | 216 -- .../VC100/UGsmooth/UGsmooth.vcxproj.filters | 45 - projects/VC100/fgadmin.rc | 1 - projects/VC100/fgadmin/fgadmin.vcxproj | 229 -- .../VC100/fgadmin/fgadmin.vcxproj.filters | 47 - projects/VC100/fgjs/fgjs.vcxproj | 215 -- projects/VC100/fgjs/fgjs.vcxproj.filters | 36 - projects/VC100/fgviewer/fgviewer.vcxproj | 211 -- .../VC100/fgviewer/fgviewer.vcxproj.filters | 22 - projects/VC100/flightgear.ico | Bin 13094 -> 0 bytes projects/VC100/flightgear.rc | 1 - projects/VC100/flightgear64.ico | Bin 13094 -> 0 bytes projects/VC100/flightgear64.rc | 1 - projects/VC100/metar/metar.vcxproj | 203 -- projects/VC100/metar/metar.vcxproj.filters | 22 - projects/VC100/terrasync/terrasync.vcxproj | 207 -- .../VC100/terrasync/terrasync.vcxproj.filters | 22 - projects/VC100/xmlgrep/xmlgrep.vcxproj | 193 -- .../VC100/xmlgrep/xmlgrep.vcxproj.filters | 36 - projects/VC100/yasim/yasim.vcxproj | 261 -- projects/VC100/yasim/yasim.vcxproj.filters | 180 - 30 files changed, 2 insertions(+), 7166 deletions(-) delete mode 100644 projects/VC100/.gitignore delete mode 100644 projects/VC100/FlightGear.sln delete mode 100644 projects/VC100/FlightGear/FlightGear.vcxproj delete mode 100644 projects/VC100/FlightGear/FlightGear.vcxproj.filters delete mode 100644 projects/VC100/GPSsmooth/GPSsmooth.vcxproj delete mode 100644 projects/VC100/GPSsmooth/GPSsmooth.vcxproj.filters delete mode 100644 projects/VC100/MIDGsmooth/MIDGsmooth.vcxproj delete mode 100644 projects/VC100/MIDGsmooth/MIDGsmooth.vcxproj.filters create mode 100644 projects/VC100/README delete mode 100644 projects/VC100/UGsmooth/UGsmooth.vcxproj delete mode 100644 projects/VC100/UGsmooth/UGsmooth.vcxproj.filters delete mode 100644 projects/VC100/fgadmin.rc delete mode 100644 projects/VC100/fgadmin/fgadmin.vcxproj delete mode 100644 projects/VC100/fgadmin/fgadmin.vcxproj.filters delete mode 100644 projects/VC100/fgjs/fgjs.vcxproj delete mode 100644 projects/VC100/fgjs/fgjs.vcxproj.filters delete mode 100644 projects/VC100/fgviewer/fgviewer.vcxproj delete mode 100644 projects/VC100/fgviewer/fgviewer.vcxproj.filters delete mode 100644 projects/VC100/flightgear.ico delete mode 100644 projects/VC100/flightgear.rc delete mode 100644 projects/VC100/flightgear64.ico delete mode 100644 projects/VC100/flightgear64.rc delete mode 100644 projects/VC100/metar/metar.vcxproj delete mode 100644 projects/VC100/metar/metar.vcxproj.filters delete mode 100644 projects/VC100/terrasync/terrasync.vcxproj delete mode 100644 projects/VC100/terrasync/terrasync.vcxproj.filters delete mode 100644 projects/VC100/xmlgrep/xmlgrep.vcxproj delete mode 100644 projects/VC100/xmlgrep/xmlgrep.vcxproj.filters delete mode 100644 projects/VC100/yasim/yasim.vcxproj delete mode 100644 projects/VC100/yasim/yasim.vcxproj.filters diff --git a/projects/VC100/.gitignore b/projects/VC100/.gitignore deleted file mode 100644 index 994d77bf7..000000000 --- a/projects/VC100/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -FlightGear.suo -FlightGear.sdf -FlightGear.opensdf -Win32 -x64 -ipch -*.user -*.sln.cache diff --git a/projects/VC100/FlightGear.sln b/projects/VC100/FlightGear.sln deleted file mode 100644 index e1ebfa828..000000000 --- a/projects/VC100/FlightGear.sln +++ /dev/null @@ -1,163 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgadmin", "fgadmin\fgadmin.vcxproj", "{7004E589-7EA0-4AFD-B432-3D5E00B55049}" - ProjectSection(ProjectDependencies) = postProject - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgjs", "fgjs\fgjs.vcxproj", "{6749547A-6493-4754-8E0E-49FB3137C4CA}" - ProjectSection(ProjectDependencies) = postProject - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgviewer", "fgviewer\fgviewer.vcxproj", "{0F13A557-EC52-481D-ADFB-9209C068FCEB}" - ProjectSection(ProjectDependencies) = postProject - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FlightGear", "FlightGear\FlightGear.vcxproj", "{49142EAF-B264-4B9F-B096-F669999EBB2E}" - ProjectSection(ProjectDependencies) = postProject - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPSsmooth", "GPSsmooth\GPSsmooth.vcxproj", "{AE9CE7E4-8F21-4C34-82DD-4D0371C210DA}" - ProjectSection(ProjectDependencies) = postProject - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "metar", "metar\metar.vcxproj", "{FC424099-5D77-4BC2-A93F-2EE59F816B51}" - ProjectSection(ProjectDependencies) = postProject - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MIDGsmooth", "MIDGsmooth\MIDGsmooth.vcxproj", "{92010FAB-17A3-4891-AE6D-507214FEA508}" - ProjectSection(ProjectDependencies) = postProject - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "terrasync", "terrasync\terrasync.vcxproj", "{874D3F55-6048-4068-A7C2-7FA6AF1F30EA}" - ProjectSection(ProjectDependencies) = postProject - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UGsmooth", "UGsmooth\UGsmooth.vcxproj", "{EEEEB798-BFFD-425F-86F9-03C6FE6B8B99}" - ProjectSection(ProjectDependencies) = postProject - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlgrep", "xmlgrep\xmlgrep.vcxproj", "{1F40CF41-9836-4488-BAAF-560623665C12}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasim", "yasim\yasim.vcxproj", "{800CB1FF-C398-4B81-B3D6-8BBD9E0897D2}" - ProjectSection(ProjectDependencies) = postProject - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimGear", "..\..\..\SimGear\projects\VC100\SimGear.vcxproj", "{22540CD3-D3CA-4C86-A773-80AEEE3ACDED}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7004E589-7EA0-4AFD-B432-3D5E00B55049}.Debug|Win32.ActiveCfg = Debug|Win32 - {7004E589-7EA0-4AFD-B432-3D5E00B55049}.Debug|Win32.Build.0 = Debug|Win32 - {7004E589-7EA0-4AFD-B432-3D5E00B55049}.Debug|x64.ActiveCfg = Debug|x64 - {7004E589-7EA0-4AFD-B432-3D5E00B55049}.Debug|x64.Build.0 = Debug|x64 - {7004E589-7EA0-4AFD-B432-3D5E00B55049}.Release|Win32.ActiveCfg = Release|Win32 - {7004E589-7EA0-4AFD-B432-3D5E00B55049}.Release|Win32.Build.0 = Release|Win32 - {7004E589-7EA0-4AFD-B432-3D5E00B55049}.Release|x64.ActiveCfg = Release|x64 - {7004E589-7EA0-4AFD-B432-3D5E00B55049}.Release|x64.Build.0 = Release|x64 - {6749547A-6493-4754-8E0E-49FB3137C4CA}.Debug|Win32.ActiveCfg = Debug|Win32 - {6749547A-6493-4754-8E0E-49FB3137C4CA}.Debug|Win32.Build.0 = Debug|Win32 - {6749547A-6493-4754-8E0E-49FB3137C4CA}.Debug|x64.ActiveCfg = Debug|x64 - {6749547A-6493-4754-8E0E-49FB3137C4CA}.Debug|x64.Build.0 = Debug|x64 - {6749547A-6493-4754-8E0E-49FB3137C4CA}.Release|Win32.ActiveCfg = Release|Win32 - {6749547A-6493-4754-8E0E-49FB3137C4CA}.Release|Win32.Build.0 = Release|Win32 - {6749547A-6493-4754-8E0E-49FB3137C4CA}.Release|x64.ActiveCfg = Release|x64 - {6749547A-6493-4754-8E0E-49FB3137C4CA}.Release|x64.Build.0 = Release|x64 - {0F13A557-EC52-481D-ADFB-9209C068FCEB}.Debug|Win32.ActiveCfg = Debug|Win32 - {0F13A557-EC52-481D-ADFB-9209C068FCEB}.Debug|Win32.Build.0 = Debug|Win32 - {0F13A557-EC52-481D-ADFB-9209C068FCEB}.Debug|x64.ActiveCfg = Debug|x64 - {0F13A557-EC52-481D-ADFB-9209C068FCEB}.Debug|x64.Build.0 = Debug|x64 - {0F13A557-EC52-481D-ADFB-9209C068FCEB}.Release|Win32.ActiveCfg = Release|Win32 - {0F13A557-EC52-481D-ADFB-9209C068FCEB}.Release|Win32.Build.0 = Release|Win32 - {0F13A557-EC52-481D-ADFB-9209C068FCEB}.Release|x64.ActiveCfg = Release|x64 - {0F13A557-EC52-481D-ADFB-9209C068FCEB}.Release|x64.Build.0 = Release|x64 - {49142EAF-B264-4B9F-B096-F669999EBB2E}.Debug|Win32.ActiveCfg = Debug|Win32 - {49142EAF-B264-4B9F-B096-F669999EBB2E}.Debug|Win32.Build.0 = Debug|Win32 - {49142EAF-B264-4B9F-B096-F669999EBB2E}.Debug|x64.ActiveCfg = Debug|x64 - {49142EAF-B264-4B9F-B096-F669999EBB2E}.Debug|x64.Build.0 = Debug|x64 - {49142EAF-B264-4B9F-B096-F669999EBB2E}.Release|Win32.ActiveCfg = Release|Win32 - {49142EAF-B264-4B9F-B096-F669999EBB2E}.Release|Win32.Build.0 = Release|Win32 - {49142EAF-B264-4B9F-B096-F669999EBB2E}.Release|x64.ActiveCfg = Release|x64 - {49142EAF-B264-4B9F-B096-F669999EBB2E}.Release|x64.Build.0 = Release|x64 - {AE9CE7E4-8F21-4C34-82DD-4D0371C210DA}.Debug|Win32.ActiveCfg = Debug|Win32 - {AE9CE7E4-8F21-4C34-82DD-4D0371C210DA}.Debug|Win32.Build.0 = Debug|Win32 - {AE9CE7E4-8F21-4C34-82DD-4D0371C210DA}.Debug|x64.ActiveCfg = Debug|x64 - {AE9CE7E4-8F21-4C34-82DD-4D0371C210DA}.Debug|x64.Build.0 = Debug|x64 - {AE9CE7E4-8F21-4C34-82DD-4D0371C210DA}.Release|Win32.ActiveCfg = Release|Win32 - {AE9CE7E4-8F21-4C34-82DD-4D0371C210DA}.Release|Win32.Build.0 = Release|Win32 - {AE9CE7E4-8F21-4C34-82DD-4D0371C210DA}.Release|x64.ActiveCfg = Release|x64 - {AE9CE7E4-8F21-4C34-82DD-4D0371C210DA}.Release|x64.Build.0 = Release|x64 - {FC424099-5D77-4BC2-A93F-2EE59F816B51}.Debug|Win32.ActiveCfg = Debug|Win32 - {FC424099-5D77-4BC2-A93F-2EE59F816B51}.Debug|Win32.Build.0 = Debug|Win32 - {FC424099-5D77-4BC2-A93F-2EE59F816B51}.Debug|x64.ActiveCfg = Debug|x64 - {FC424099-5D77-4BC2-A93F-2EE59F816B51}.Debug|x64.Build.0 = Debug|x64 - {FC424099-5D77-4BC2-A93F-2EE59F816B51}.Release|Win32.ActiveCfg = Release|Win32 - {FC424099-5D77-4BC2-A93F-2EE59F816B51}.Release|Win32.Build.0 = Release|Win32 - {FC424099-5D77-4BC2-A93F-2EE59F816B51}.Release|x64.ActiveCfg = Release|x64 - {FC424099-5D77-4BC2-A93F-2EE59F816B51}.Release|x64.Build.0 = Release|x64 - {92010FAB-17A3-4891-AE6D-507214FEA508}.Debug|Win32.ActiveCfg = Debug|Win32 - {92010FAB-17A3-4891-AE6D-507214FEA508}.Debug|Win32.Build.0 = Debug|Win32 - {92010FAB-17A3-4891-AE6D-507214FEA508}.Debug|x64.ActiveCfg = Debug|x64 - {92010FAB-17A3-4891-AE6D-507214FEA508}.Debug|x64.Build.0 = Debug|x64 - {92010FAB-17A3-4891-AE6D-507214FEA508}.Release|Win32.ActiveCfg = Release|Win32 - {92010FAB-17A3-4891-AE6D-507214FEA508}.Release|Win32.Build.0 = Release|Win32 - {92010FAB-17A3-4891-AE6D-507214FEA508}.Release|x64.ActiveCfg = Release|x64 - {92010FAB-17A3-4891-AE6D-507214FEA508}.Release|x64.Build.0 = Release|x64 - {874D3F55-6048-4068-A7C2-7FA6AF1F30EA}.Debug|Win32.ActiveCfg = Debug|Win32 - {874D3F55-6048-4068-A7C2-7FA6AF1F30EA}.Debug|Win32.Build.0 = Debug|Win32 - {874D3F55-6048-4068-A7C2-7FA6AF1F30EA}.Debug|x64.ActiveCfg = Debug|x64 - {874D3F55-6048-4068-A7C2-7FA6AF1F30EA}.Release|Win32.ActiveCfg = Release|Win32 - {874D3F55-6048-4068-A7C2-7FA6AF1F30EA}.Release|Win32.Build.0 = Release|Win32 - {874D3F55-6048-4068-A7C2-7FA6AF1F30EA}.Release|x64.ActiveCfg = Release|x64 - {EEEEB798-BFFD-425F-86F9-03C6FE6B8B99}.Debug|Win32.ActiveCfg = Debug|Win32 - {EEEEB798-BFFD-425F-86F9-03C6FE6B8B99}.Debug|Win32.Build.0 = Debug|Win32 - {EEEEB798-BFFD-425F-86F9-03C6FE6B8B99}.Debug|x64.ActiveCfg = Debug|x64 - {EEEEB798-BFFD-425F-86F9-03C6FE6B8B99}.Debug|x64.Build.0 = Debug|x64 - {EEEEB798-BFFD-425F-86F9-03C6FE6B8B99}.Release|Win32.ActiveCfg = Release|Win32 - {EEEEB798-BFFD-425F-86F9-03C6FE6B8B99}.Release|Win32.Build.0 = Release|Win32 - {EEEEB798-BFFD-425F-86F9-03C6FE6B8B99}.Release|x64.ActiveCfg = Release|x64 - {EEEEB798-BFFD-425F-86F9-03C6FE6B8B99}.Release|x64.Build.0 = Release|x64 - {1F40CF41-9836-4488-BAAF-560623665C12}.Debug|Win32.ActiveCfg = Debug|Win32 - {1F40CF41-9836-4488-BAAF-560623665C12}.Debug|Win32.Build.0 = Debug|Win32 - {1F40CF41-9836-4488-BAAF-560623665C12}.Debug|x64.ActiveCfg = Debug|x64 - {1F40CF41-9836-4488-BAAF-560623665C12}.Debug|x64.Build.0 = Debug|x64 - {1F40CF41-9836-4488-BAAF-560623665C12}.Release|Win32.ActiveCfg = Release|Win32 - {1F40CF41-9836-4488-BAAF-560623665C12}.Release|Win32.Build.0 = Release|Win32 - {1F40CF41-9836-4488-BAAF-560623665C12}.Release|x64.ActiveCfg = Release|x64 - {1F40CF41-9836-4488-BAAF-560623665C12}.Release|x64.Build.0 = Release|x64 - {800CB1FF-C398-4B81-B3D6-8BBD9E0897D2}.Debug|Win32.ActiveCfg = Debug|Win32 - {800CB1FF-C398-4B81-B3D6-8BBD9E0897D2}.Debug|Win32.Build.0 = Debug|Win32 - {800CB1FF-C398-4B81-B3D6-8BBD9E0897D2}.Debug|x64.ActiveCfg = Debug|x64 - {800CB1FF-C398-4B81-B3D6-8BBD9E0897D2}.Debug|x64.Build.0 = Debug|x64 - {800CB1FF-C398-4B81-B3D6-8BBD9E0897D2}.Release|Win32.ActiveCfg = Release|Win32 - {800CB1FF-C398-4B81-B3D6-8BBD9E0897D2}.Release|Win32.Build.0 = Release|Win32 - {800CB1FF-C398-4B81-B3D6-8BBD9E0897D2}.Release|x64.ActiveCfg = Release|x64 - {800CB1FF-C398-4B81-B3D6-8BBD9E0897D2}.Release|x64.Build.0 = Release|x64 - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Debug|Win32.ActiveCfg = Debug|Win32 - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Debug|Win32.Build.0 = Debug|Win32 - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Debug|x64.ActiveCfg = Debug|x64 - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Debug|x64.Build.0 = Debug|x64 - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Release|Win32.ActiveCfg = Release|Win32 - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Release|Win32.Build.0 = Release|Win32 - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Release|x64.ActiveCfg = Release|x64 - {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/projects/VC100/FlightGear/FlightGear.vcxproj b/projects/VC100/FlightGear/FlightGear.vcxproj deleted file mode 100644 index dad686e5f..000000000 --- a/projects/VC100/FlightGear/FlightGear.vcxproj +++ /dev/null @@ -1,1429 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {49142EAF-B264-4B9F-B096-F669999EBB2E} - FlightGear - - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - MultiByte - - - Application - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - fgfs - fgfs - fgfs - fgfs - - - - .\Debug/FlightGear.tlb - - - Disabled - ..\..\..\src;..\..\..\src\include;..\..\..\..\SimGear;..\..\..\src\FDM\JSBSim;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_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;%(PreprocessorDefinitions) - true - Default - MultiThreadedDebugDLL - true - true - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c09 - - - /MACHINE:I386 %(AdditionalOptions) - 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\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;..\..\..\..\boost_1_44_0\lib;%(AdditionalLibraryDirectories) - %(IgnoreSpecificDefaultLibraries) - true - Console - false - - - MultiplyDefinedSymbolOnly - - - - - X64 - .\Debug/FlightGear.tlb - - - Disabled - ..\..\..\src;..\..\..\src\include;..\..\..\..\SimGear;..\..\..\src\FDM\JSBSim;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_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;%(PreprocessorDefinitions) - true - Default - MultiThreadedDebugDLL - true - true - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c09 - - - 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\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;..\..\..\..\boost_1_44_0\lib64;%(AdditionalLibraryDirectories) - %(IgnoreSpecificDefaultLibraries) - true - Console - false - - - MachineX64 - MultiplyDefinedSymbolOnly - - - - - .\Release/FlightGear.tlb - - - AnySuitable - ..\..\..\src;..\..\..\src\include;..\..\..\src\FDM\JSBSim;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_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;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - Level3 - true - ProgramDatabase - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c09 - - - /MACHINE:I386 %(AdditionalOptions) - 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\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;..\..\..\..\boost_1_44_0\lib;%(AdditionalLibraryDirectories) - %(IgnoreSpecificDefaultLibraries) - true - Console - false - - - MultiplyDefinedSymbolOnly - - - - - X64 - .\Release/FlightGear.tlb - - - OnlyExplicitInline - ..\..\..\src;..\..\..\src\include;..\..\..\src\FDM\JSBSim;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_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;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - Level3 - true - ProgramDatabase - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c09 - - - 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\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;..\..\..\..\boost_1_44_0\lib64;%(AdditionalLibraryDirectories) - %(IgnoreSpecificDefaultLibraries) - true - Console - false - - - MachineX64 - MultiplyDefinedSymbolOnly - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - - - - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - - - - - - - - - - - - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Generation of config.h - copy %(FullPath) %(RootDir)%(Directory)\%(Filename).h - - ..\..\..\src\Include\config.h;%(Outputs) - Generation of config.h - copy %(FullPath) %(RootDir)%(Directory)\%(Filename).h - - ..\..\..\src\Include\config.h;%(Outputs) - Generation of config.h - copy %(FullPath) %(RootDir)%(Directory)\%(Filename).h - - ..\..\..\src\Include\config.h;%(Outputs) - Generation of config.h - copy %(FullPath) %(RootDir)%(Directory)\%(Filename).h - - ..\..\..\src\Include\config.h;%(Outputs) - - - true - true - - - true - true - - - - - true - true - - - true - true - - - - - {22540cd3-d3ca-4c86-a773-80aeee3acded} - - - - - - \ No newline at end of file diff --git a/projects/VC100/FlightGear/FlightGear.vcxproj.filters b/projects/VC100/FlightGear/FlightGear.vcxproj.filters deleted file mode 100644 index fa82e5d60..000000000 --- a/projects/VC100/FlightGear/FlightGear.vcxproj.filters +++ /dev/null @@ -1,2939 +0,0 @@ - - - - - {5b5a7035-1789-4175-be3c-5ba77c37de44} - - - {8efb426e-e23e-42d6-9e6e-406c51e3a65c} - - - {7d7c9038-3ad4-4e1f-b67d-d27baa06f8e8} - - - {a2116df7-5e2f-40d8-a56f-ef96cdebd6c6} - - - {6ed1f548-d273-46c6-a0bb-b9ee2303f481} - - - {eacbd83d-0087-44ce-a78f-73d5498b2af1} - - - {d8c4cb07-9e19-43f0-a85a-dcf30b2545c7} - - - {183efdbf-00a8-427a-98da-dec58255128e} - - - {411dbaca-baf6-4170-b100-71a554209935} - - - {9436baf4-76e7-4226-a161-60eab79eb34b} - - - {2487fd19-c144-45be-aea7-289d221345b5} - - - {d371bccf-2c19-4079-b535-d031216e8490} - - - {27550555-bc98-408b-b4b0-4ebd297b6a3d} - - - {b3b2ce93-c999-472a-bfa6-06c1143c7fae} - - - {cb4d76a1-7275-4cd6-a305-63636b13ade9} - - - {ff59ef83-e9a1-46ac-8391-e268a9df0dfc} - - - {fabb1c71-61fb-4a57-88da-26945141c440} - - - {940c9533-0978-40ef-8d39-961d0ad89b4e} - - - {c9754169-5e10-4035-9544-6294c31d9709} - - - {131a31a9-d8bd-4a93-8cce-4798aa9c9bc9} - - - {0c65f02c-7bae-4389-bf94-5e2c67ba0e68} - - - {81173da0-37ce-43a2-85a6-0a5efcbfed91} - - - {bae088e3-d112-4668-b653-beb723426c96} - - - {6b8abb03-12fe-470a-a3d6-69f2b99cb082} - - - {56f378cc-a098-4fc1-b6db-708df701363c} - - - {10afb571-0a80-4493-9d07-71dbb3e128fb} - - - {5f18d822-922b-4bc5-a197-1f9c749d3aca} - - - {da1bf6b6-517a-4d9b-8de2-b43a126426a8} - - - {3a8fdd5f-359c-4867-b542-c680216b835b} - - - {5ecfbcb6-4b64-419f-8e53-f0cf299087bf} - - - {4d06a2fc-202e-44ed-bf26-22bbef505bc5} - - - {1965f1ef-8cc9-40d6-876b-6f1787bd300d} - - - {175c5293-cb40-47ec-bceb-f234bedfd31c} - - - {bed96b77-e07c-42c9-956a-df71af33a794} - - - {0a02d14a-7bb7-4564-a1b9-7a8f5ccc9cbd} - - - {044334ac-08b1-409d-acd5-b950b9d57ced} - - - {22009ac9-4ac5-4518-afd8-0b237abe6d00} - - - {9a55973a-7b5a-4fbd-9873-93012209f7e0} - - - {8cae8c55-248a-4be4-a389-24f651d7b9ea} - - - {8f862bbd-b18e-4576-989c-a9463482781a} - - - - - Lib_Aircraft - - - Lib_Aircraft - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_Autopilot - - - Lib_Cockpit - - - Lib_Cockpit - - - Lib_Cockpit\build_in - - - Lib_JSBSim - - - Lib_JSBSim - - - Lib_JSBSim - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models\atmosphere - - - Lib_JSBSim\models\atmosphere - - - Lib_JSBSim\models\atmosphere - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\input_output - - - Lib_JSBSim\input_output - - - Lib_JSBSim\input_output - - - Lib_JSBSim\input_output - - - Lib_JSBSim\input_output - - - Lib_JSBSim\input_output - - - Lib_JSBSim\initialization - - - Lib_JSBSim\initialization - - - Lib_JSBSim\initialization - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_Flight - - - Lib_Flight - - - Lib_Flight - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_Input - - - Lib_Input - - - Lib_Input - - - Lib_Input - - - Lib_Input - - - Lib_Input - - - Lib_Input - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Scenery - - - Lib_Scenery - - - Lib_Scenery - - - Lib_Scenery - - - Lib_Sound - - - Lib_Sound - - - Lib_Sound - - - Lib_Sound - - - Lib_Sound - - - Lib_Time - - - Lib_Time - - - Lib_Multiplayer - - - Lib_Multiplayer - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Model - - - Lib_Model - - - Lib_Model - - - Lib_Model - - - Lib_UFO - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation\Lib_HUD - - - Lib_Instrumentation\Lib_HUD - - - Lib_Instrumentation\Lib_HUD - - - Lib_Instrumentation\Lib_HUD - - - Lib_Instrumentation\Lib_HUD - - - Lib_Instrumentation\Lib_HUD - - - Lib_Instrumentation\Lib_HUD - - - Lib_Instrumentation\Lib_HUD - - - Lib_Instrumentation\Lib_HUD - - - Lib_Instrumentation\Lib_HUD - - - Lib_Instrumentation\Lib_HUD - - - Lib_Systems - - - Lib_Systems - - - Lib_Systems - - - Lib_Systems - - - Lib_Systems - - - Lib_ExternalNet - - - ExternalPipe - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_Traffic - - - Lib_Traffic - - - Lib_Traffic - - - Lib_SP - - - Lib_SP - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_ATC - - - Lib_JSBSim\math - - - Lib_Flight - - - Lib_ATC - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Flight - - - Lib_Environment - - - Lib_ATC - - - Lib_Time - - - Lib_JSBSim\math - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Instrumentation - - - Lib_KLN89 - - - - - Lib_Aircraft - - - Lib_Aircraft - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_Airports - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_ATCDCL - - - Lib_Autopilot - - - Lib_Cockpit - - - Lib_Cockpit - - - Lib_Cockpit\build_in - - - Lib_JSBSim - - - Lib_JSBSim - - - Lib_JSBSim - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\math - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models - - - Lib_JSBSim\models\atmosphere - - - Lib_JSBSim\models\atmosphere - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\flight_control - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\models\propulsion - - - Lib_JSBSim\input_output - - - Lib_JSBSim\input_output - - - Lib_JSBSim\input_output - - - Lib_JSBSim\input_output - - - Lib_JSBSim\input_output - - - Lib_JSBSim\input_output - - - Lib_JSBSim\input_output - - - Lib_JSBSim\input_output - - - Lib_JSBSim\initialization - - - Lib_JSBSim\initialization - - - Lib_JSBSim\initialization - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_LaRCsim - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_UIUCModel - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_YASim - - - Lib_Flight - - - Lib_Flight - - - Lib_Flight - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_GUI - - - Lib_Input - - - Lib_Input - - - Lib_Input - - - Lib_Input - - - Lib_Input - - - Lib_Input - - - Lib_Input - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - main - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Network - - - Lib_Scenery - - - Lib_Scenery - - - Lib_Scenery - - - Lib_Scenery - - - Lib_Sound - - - Lib_Sound - - - Lib_Sound - - - Lib_Sound - - - Lib_Sound - - - Lib_Time - - - Lib_Time - - - Lib_Multiplayer - - - Lib_Multiplayer - - - Lib_Multiplayer - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Environment - - - Lib_Model - - - Lib_Model - - - Lib_Model - - - Lib_Model - - - Lib_UFO - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation - - - Lib_Instrumentation\Lib_HUD - - - Lib_Systems - - - Lib_Systems - - - Lib_Systems - - - Lib_Systems - - - Lib_Systems - - - Lib_ExternalNet - - - ExternalPipe - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_AIModel - - - Lib_Traffic - - - Lib_Traffic - - - Lib_Traffic - - - Lib_SP - - - Lib_SP - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_KLN89 - - - Lib_ATC - - - Lib_JSBSim\math - - - Lib_Flight - - - Lib_ATC - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Autopilot - - - Lib_Flight - - - Lib_Environment - - - Lib_ATC - - - Lib_Time - - - Lib_JSBSim\math - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Navaids - - - Lib_Instrumentation - - - Lib_KLN89 - - - - - - - - - - - - - - \ No newline at end of file diff --git a/projects/VC100/GPSsmooth/GPSsmooth.vcxproj b/projects/VC100/GPSsmooth/GPSsmooth.vcxproj deleted file mode 100644 index 01e9faee7..000000000 --- a/projects/VC100/GPSsmooth/GPSsmooth.vcxproj +++ /dev/null @@ -1,208 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {AE9CE7E4-8F21-4C34-82DD-4D0371C210DA} - GPSsmooth - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - sg_d.lib;net_d.lib;ul_d.lib;ws2_32.lib;winmm.lib;zlibd.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)GPSsmooth.pdb - Console - false - - - MachineX86 - - - - - X64 - - - Disabled - ..\..\..\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 - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - sg_d.lib;net_d.lib;ul_d.lib;ws2_32.lib;winmm.lib;zlibd.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)GPSsmooth.pdb - Console - false - - - MachineX64 - - - - - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - AnySuitable - - - sg.lib;net.lib;ul.lib;ws2_32.lib;winmm.lib;zlib.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX86 - - - - - X64 - - - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - sg.lib;net.lib;ul.lib;ws2_32.lib;winmm.lib;zlib.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - - {22540cd3-d3ca-4c86-a773-80aeee3acded} - - - - - - \ No newline at end of file diff --git a/projects/VC100/GPSsmooth/GPSsmooth.vcxproj.filters b/projects/VC100/GPSsmooth/GPSsmooth.vcxproj.filters deleted file mode 100644 index 8c91450e0..000000000 --- a/projects/VC100/GPSsmooth/GPSsmooth.vcxproj.filters +++ /dev/null @@ -1,30 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/projects/VC100/MIDGsmooth/MIDGsmooth.vcxproj b/projects/VC100/MIDGsmooth/MIDGsmooth.vcxproj deleted file mode 100644 index 4c52c0bac..000000000 --- a/projects/VC100/MIDGsmooth/MIDGsmooth.vcxproj +++ /dev/null @@ -1,211 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {92010FAB-17A3-4891-AE6D-507214FEA508} - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - - - Level3 - EditAndContinue - - - sg_d.lib;net_d.lib;ul_d.lib;ws2_32.lib;winmm.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)MIDGsmooth.pdb - Console - false - - - MachineX86 - - - - - X64 - - - Disabled - ..\..\..\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 - MultiThreadedDebugDLL - true - - - Level3 - EditAndContinue - - - sg_d.lib;net_d.lib;ul_d.lib;ws2_32.lib;winmm.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)MIDGsmooth.pdb - Console - false - - - MachineX64 - - - - - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - AnySuitable - - - sg.lib;net.lib;ul.lib;ws2_32.lib;winmm.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX86 - - - - - X64 - - - ..\..\..\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 - - - Level3 - ProgramDatabase - - - sg.lib;net.lib;ul.lib;ws2_32.lib;winmm.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - - {22540cd3-d3ca-4c86-a773-80aeee3acded} - - - - - - \ No newline at end of file diff --git a/projects/VC100/MIDGsmooth/MIDGsmooth.vcxproj.filters b/projects/VC100/MIDGsmooth/MIDGsmooth.vcxproj.filters deleted file mode 100644 index 78a176a0a..000000000 --- a/projects/VC100/MIDGsmooth/MIDGsmooth.vcxproj.filters +++ /dev/null @@ -1,30 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/projects/VC100/README b/projects/VC100/README new file mode 100644 index 000000000..aeca7db74 --- /dev/null +++ b/projects/VC100/README @@ -0,0 +1,2 @@ +The handmade VS2010 project files have been replaced by the Cmake build system. +Please use Cmake to build FlightGear with Visual Studio 2010. diff --git a/projects/VC100/UGsmooth/UGsmooth.vcxproj b/projects/VC100/UGsmooth/UGsmooth.vcxproj deleted file mode 100644 index c956eb164..000000000 --- a/projects/VC100/UGsmooth/UGsmooth.vcxproj +++ /dev/null @@ -1,216 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {EEEEB798-BFFD-425F-86F9-03C6FE6B8B99} - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - - - Level3 - EditAndContinue - - - sg_d.lib;net_d.lib;ul_d.lib;ws2_32.lib;winmm.lib;zlibd.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)UGsmooth.pdb - Console - false - - - MachineX86 - - - - - X64 - - - Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - - - Level3 - EditAndContinue - - - sg_d.lib;net_d.lib;ul_d.lib;ws2_32.lib;winmm.lib;zlibd.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)UGsmooth.pdb - Console - false - - - MachineX64 - - - - - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - AnySuitable - - - sg.lib;net.lib;ul.lib;ws2_32.lib;winmm.lib;zlib.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX86 - - - - - X64 - - - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - sg.lib;net.lib;ul.lib;ws2_32.lib;winmm.lib;zlib.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - - - - - - - {22540cd3-d3ca-4c86-a773-80aeee3acded} - - - - - - \ No newline at end of file diff --git a/projects/VC100/UGsmooth/UGsmooth.vcxproj.filters b/projects/VC100/UGsmooth/UGsmooth.vcxproj.filters deleted file mode 100644 index a335f818e..000000000 --- a/projects/VC100/UGsmooth/UGsmooth.vcxproj.filters +++ /dev/null @@ -1,45 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/projects/VC100/fgadmin.rc b/projects/VC100/fgadmin.rc deleted file mode 100644 index a25aa7813..000000000 --- a/projects/VC100/fgadmin.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON "flightgear.ico" diff --git a/projects/VC100/fgadmin/fgadmin.vcxproj b/projects/VC100/fgadmin/fgadmin.vcxproj deleted file mode 100644 index c7c59e4ec..000000000 --- a/projects/VC100/fgadmin/fgadmin.vcxproj +++ /dev/null @@ -1,229 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {7004E589-7EA0-4AFD-B432-3D5E00B55049} - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - ..\..\..\..\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 - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - fltkd.lib;ul_d.lib;comctl32.lib;wsock32.lib;zlibd.lib;sg_d.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)fgadmin.pdb - Console - false - - - MachineX86 - - - - - X64 - - - Disabled - ..\..\..\..\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 - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - fltkd.lib;ul_d.lib;comctl32.lib;wsock32.lib;zlibd.lib;sg_d.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)fgadmin.pdb - Console - false - - - MachineX64 - - - - - MaxSpeed - AnySuitable - true - ..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;HAVE_ZLIB;NOMINMAX;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - Level3 - - - - - fltk.lib;ul.lib;sg.lib;comctl32.lib;wsock32.lib;zlib.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - false - - - MachineX86 - - - - - X64 - - - MaxSpeed - OnlyExplicitInline - true - ..\..\..\..\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 - true - - - Level3 - - - - - fltk.lib;ul.lib;sg.lib;comctl32.lib;wsock32.lib;zlib.lib;%(AdditionalDependencies) - ..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - false - - - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - {22540cd3-d3ca-4c86-a773-80aeee3acded} - - - - - - \ No newline at end of file diff --git a/projects/VC100/fgadmin/fgadmin.vcxproj.filters b/projects/VC100/fgadmin/fgadmin.vcxproj.filters deleted file mode 100644 index dfbf2a092..000000000 --- a/projects/VC100/fgadmin/fgadmin.vcxproj.filters +++ /dev/null @@ -1,47 +0,0 @@ - - - - - {563ffc76-1709-4474-b936-8c8b1ef2cf9e} - cpp;c;cxx;def;odl;idl;hpj;bat;asm - - - {1fb342bf-ece0-497c-9a9b-8bfb0b461604} - h;hpp;hxx;hm;inl;inc - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - - - - - \ No newline at end of file diff --git a/projects/VC100/fgjs/fgjs.vcxproj b/projects/VC100/fgjs/fgjs.vcxproj deleted file mode 100644 index 894ec6eaa..000000000 --- a/projects/VC100/fgjs/fgjs.vcxproj +++ /dev/null @@ -1,215 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {6749547A-6493-4754-8E0E-49FB3137C4CA} - fgjs - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - - - Level3 - EditAndContinue - - - sg_d.lib;js_d.lib;ul_d.lib;zlibd.lib;winmm.lib;ws2_32.lib;OpenThreadsd.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)fgjs.pdb - Console - false - - - MachineX86 - - - - - X64 - - - Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - Level3 - EditAndContinue - - - sg_d.lib;js_d.lib;ul_d.lib;zlibd.lib;winmm.lib;ws2_32.lib;OpenThreadsd.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)fgjs.pdb - Console - false - - - MachineX64 - - - - - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - AnySuitable - - - sg.lib;js.lib;ul.lib;zlib.lib;winmm.lib;ws2_32.lib;OpenThreads.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX86 - - - - - - - X64 - - - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - sg.lib;js.lib;ul.lib;zlib.lib;winmm.lib;ws2_32.lib;OpenThreads.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - - - - {22540cd3-d3ca-4c86-a773-80aeee3acded} - - - - - - \ No newline at end of file diff --git a/projects/VC100/fgjs/fgjs.vcxproj.filters b/projects/VC100/fgjs/fgjs.vcxproj.filters deleted file mode 100644 index 038014706..000000000 --- a/projects/VC100/fgjs/fgjs.vcxproj.filters +++ /dev/null @@ -1,36 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/projects/VC100/fgviewer/fgviewer.vcxproj b/projects/VC100/fgviewer/fgviewer.vcxproj deleted file mode 100644 index 957fa08d3..000000000 --- a/projects/VC100/fgviewer/fgviewer.vcxproj +++ /dev/null @@ -1,211 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {0F13A557-EC52-481D-ADFB-9209C068FCEB} - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - ..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\boost_1_44_0;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - - - Level3 - EditAndContinue - - - 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\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;..\..\..\..\boost_1_44_0\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)fgviewer.pdb - Console - false - - - MachineX86 - MultiplyDefinedSymbolOnly - - - - - X64 - - - Disabled - ..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\boost_1_44_0;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - - - Level3 - EditAndContinue - - - 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\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;..\..\..\..\boost_1_44_0\lib64;%(AdditionalLibraryDirectories) - true - $(OutDir)fgviewer.pdb - Console - false - - - MachineX64 - MultiplyDefinedSymbolOnly - - - - - ..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\boost_1_44_0;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - AnySuitable - - - 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\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;..\..\..\..\boost_1_44_0\lib;%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX86 - MultiplyDefinedSymbolOnly - - - - - X64 - - - ..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\boost_1_44_0;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - 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\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;..\..\..\..\boost_1_44_0\lib64;%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX64 - MultiplyDefinedSymbolOnly - - - - - - - - {22540cd3-d3ca-4c86-a773-80aeee3acded} - - - - - - \ No newline at end of file diff --git a/projects/VC100/fgviewer/fgviewer.vcxproj.filters b/projects/VC100/fgviewer/fgviewer.vcxproj.filters deleted file mode 100644 index fe8015b61..000000000 --- a/projects/VC100/fgviewer/fgviewer.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Source Files - - - \ No newline at end of file diff --git a/projects/VC100/flightgear.ico b/projects/VC100/flightgear.ico deleted file mode 100644 index e041319f68923c376c418b2887176b54e34ae3d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13094 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ξ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 diff --git a/projects/VC100/flightgear64.rc b/projects/VC100/flightgear64.rc deleted file mode 100644 index 0a929ebcb..000000000 --- a/projects/VC100/flightgear64.rc +++ /dev/null @@ -1 +0,0 @@ -FLIGHTGEAR ICON "flightgear64.ico" diff --git a/projects/VC100/metar/metar.vcxproj b/projects/VC100/metar/metar.vcxproj deleted file mode 100644 index a65f7fcf4..000000000 --- a/projects/VC100/metar/metar.vcxproj +++ /dev/null @@ -1,203 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {FC424099-5D77-4BC2-A93F-2EE59F816B51} - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - ..\..\..\..\SimGear;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - ws2_32.lib;%(AdditionalDependencies) - %(AdditionalLibraryDirectories) - true - $(OutDir)metar.pdb - Console - false - - - MachineX86 - - - - - X64 - - - Disabled - ..\..\..\..\SimGear;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - ws2_32.lib;%(AdditionalDependencies) - %(AdditionalLibraryDirectories) - true - $(OutDir)metar.pdb - Console - false - - - MachineX64 - - - - - ..\..\..\..\SimGear;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - AnySuitable - - - ws2_32.lib;%(AdditionalDependencies) - %(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX86 - - - - - X64 - - - ..\..\..\..\SimGear;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - ws2_32.lib;%(AdditionalDependencies) - %(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX64 - - - - - - - - {22540cd3-d3ca-4c86-a773-80aeee3acded} - - - - - - \ No newline at end of file diff --git a/projects/VC100/metar/metar.vcxproj.filters b/projects/VC100/metar/metar.vcxproj.filters deleted file mode 100644 index 927f4f99b..000000000 --- a/projects/VC100/metar/metar.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Source Files - - - \ No newline at end of file diff --git a/projects/VC100/terrasync/terrasync.vcxproj b/projects/VC100/terrasync/terrasync.vcxproj deleted file mode 100644 index 2edb4903e..000000000 --- a/projects/VC100/terrasync/terrasync.vcxproj +++ /dev/null @@ -1,207 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {874D3F55-6048-4068-A7C2-7FA6AF1F30EA} - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - ..\..\..\..\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 - MultiThreadedDebugDLL - true - - - Level3 - EditAndContinue - - - 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\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)terrasync.pdb - Console - false - - - MachineX86 - - - - - X64 - - - Disabled - ..\..\..\..\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 - MultiThreadedDebugDLL - true - - - Level3 - EditAndContinue - - - 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\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)terrasync.pdb - Console - false - - - MachineX64 - - - - - ..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NOMINMAX;HAVE_SVN_CLIENT_H;HAVE_LIBSVN_CLIENT_1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - AnySuitable - - - 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\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX86 - - - - - X64 - - - ..\..\..\..\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 - - - Level3 - ProgramDatabase - - - 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\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX64 - - - - - - - - {22540cd3-d3ca-4c86-a773-80aeee3acded} - - - - - - \ No newline at end of file diff --git a/projects/VC100/terrasync/terrasync.vcxproj.filters b/projects/VC100/terrasync/terrasync.vcxproj.filters deleted file mode 100644 index f63c8e6b8..000000000 --- a/projects/VC100/terrasync/terrasync.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Source Files - - - \ No newline at end of file diff --git a/projects/VC100/xmlgrep/xmlgrep.vcxproj b/projects/VC100/xmlgrep/xmlgrep.vcxproj deleted file mode 100644 index f2894ce6f..000000000 --- a/projects/VC100/xmlgrep/xmlgrep.vcxproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {1F40CF41-9836-4488-BAAF-560623665C12} - xmlgrep - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - $(OutDir)xmlgrep.pdb - Console - false - - - MachineX86 - - - - - X64 - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - $(OutDir)xmlgrep.pdb - Console - false - - - MachineX64 - - - - - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - AnySuitable - - - true - Console - true - true - false - - - MachineX86 - - - - - X64 - - - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/projects/VC100/xmlgrep/xmlgrep.vcxproj.filters b/projects/VC100/xmlgrep/xmlgrep.vcxproj.filters deleted file mode 100644 index 9bf80bae5..000000000 --- a/projects/VC100/xmlgrep/xmlgrep.vcxproj.filters +++ /dev/null @@ -1,36 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/projects/VC100/yasim/yasim.vcxproj b/projects/VC100/yasim/yasim.vcxproj deleted file mode 100644 index 689910c80..000000000 --- a/projects/VC100/yasim/yasim.vcxproj +++ /dev/null @@ -1,261 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {800CB1FF-C398-4B81-B3D6-8BBD9E0897D2} - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - - - Level3 - EditAndContinue - - - sg_d.lib;ul_d.lib;OpenThreadsd.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)yasim.pdb - Console - false - - - MachineX86 - - - - - X64 - - - Disabled - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - - - Level3 - EditAndContinue - - - sg_d.lib;ul_d.lib;OpenThreadsd.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)yasim.pdb - Console - false - - - MachineX64 - - - - - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - AnySuitable - - - sg.lib;ul.lib;OpenThreads.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX86 - - - - - X64 - - - ..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - sg.lib;ul.lib;OpenThreads.lib;%(AdditionalDependencies) - ..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {22540cd3-d3ca-4c86-a773-80aeee3acded} - - - - - - \ No newline at end of file diff --git a/projects/VC100/yasim/yasim.vcxproj.filters b/projects/VC100/yasim/yasim.vcxproj.filters deleted file mode 100644 index 02bac020e..000000000 --- a/projects/VC100/yasim/yasim.vcxproj.filters +++ /dev/null @@ -1,180 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file From 0807cf3ae67a23786119c589d3e126c2cac0ad59 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Fri, 28 Jan 2011 19:30:27 +0100 Subject: [PATCH 04/16] Cmake: set an icon to the Windows executable --- src/Main/.gitignore | 1 + src/Main/CMakeLists.txt | 5 +++++ src/Main/flightgear.ico | Bin 0 -> 13094 bytes src/Main/flightgear.rc | 1 + 4 files changed, 7 insertions(+) create mode 100644 src/Main/flightgear.ico create mode 100644 src/Main/flightgear.rc diff --git a/src/Main/.gitignore b/src/Main/.gitignore index 5ffcb24f2..d0c58f586 100644 --- a/src/Main/.gitignore +++ b/src/Main/.gitignore @@ -2,3 +2,4 @@ fgfs metar runfgfs runfgfs.bat +flightgear.aps diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt index ff4538c2e..b48d88a70 100644 --- a/src/Main/CMakeLists.txt +++ b/src/Main/CMakeLists.txt @@ -1,4 +1,8 @@ +if (MSVC) + set( RESOURCE_FILE flightgear.rc ) +endif (MSVC) + set(SOURCES CameraGroup.cxx FGEventHandler.cxx @@ -21,6 +25,7 @@ set(SOURCES util.cxx viewer.cxx viewmgr.cxx + ${RESOURCE_FILE} ) add_executable(fgfs ${SOURCES}) diff --git a/src/Main/flightgear.ico b/src/Main/flightgear.ico new file mode 100644 index 0000000000000000000000000000000000000000..e041319f68923c376c418b2887176b54e34ae3d8 GIT binary patch literal 13094 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ξ3OAqzZ6uM#8ppQtfzPb}JjaF?0=YOIl00A{n+>HBK&3*ZB*km<3%B%S_Ftes z!h|dLSmL-z5{w%mO4t~re{fjmsmfD2018U=Ci;`(wIFQ6pbsa-;+TsKp;LOv0-{D zg`QJ^-x9=u7TP?-8XCfmGL!yK2Jr%EScD#+Nf3|r7g!b*&{H&+UkvPbCOqU%(iI0} zl4ojY&tx)Xp1(nQ%I7MAO_3!6R_;zHWXasVA0Gzc!d_Vm-YH#{5{GnP9(g{{nMwZ1 zaM&J{onR`&m9-?Yv?{6+srB~%1;%8;D Date: Fri, 28 Jan 2011 19:34:49 +0100 Subject: [PATCH 05/16] Cmake: use different icons for 32-bit and 64-bit executables --- src/Main/CMakeLists.txt | 6 +++++- src/Main/flightgear64.ico | Bin 0 -> 13094 bytes src/Main/flightgear64.rc | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 src/Main/flightgear64.ico create mode 100644 src/Main/flightgear64.rc diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt index b48d88a70..954c020bc 100644 --- a/src/Main/CMakeLists.txt +++ b/src/Main/CMakeLists.txt @@ -1,6 +1,10 @@ if (MSVC) - set( RESOURCE_FILE flightgear.rc ) + if (CMAKE_CL_64) + set( RESOURCE_FILE flightgear64.rc ) + else (CMAKE_CL_64) + set( RESOURCE_FILE flightgear.rc ) + endif (CMAKE_CL_64) endif (MSVC) set(SOURCES diff --git a/src/Main/flightgear64.ico b/src/Main/flightgear64.ico new file mode 100644 index 0000000000000000000000000000000000000000..4f262054d9f4725ee9dc2647bbb2c9d2d13dc5d3 GIT binary patch literal 13094 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 literal 0 HcmV?d00001 diff --git a/src/Main/flightgear64.rc b/src/Main/flightgear64.rc new file mode 100644 index 000000000..0a929ebcb --- /dev/null +++ b/src/Main/flightgear64.rc @@ -0,0 +1 @@ +FLIGHTGEAR ICON "flightgear64.ico" From 2a7afaf64233a001b87b692ac8975f0f38160024 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Fri, 28 Jan 2011 20:12:56 +0100 Subject: [PATCH 06/16] Cmake: add a rule to build sources from fluid (.fl) files --- utils/fgadmin/src/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/utils/fgadmin/src/CMakeLists.txt b/utils/fgadmin/src/CMakeLists.txt index 045ab0b4f..d0e0812fd 100644 --- a/utils/fgadmin/src/CMakeLists.txt +++ b/utils/fgadmin/src/CMakeLists.txt @@ -1,7 +1,11 @@ -add_executable(fgadmin fgadmin.cxx fgadmin_funcs.cxx main.cxx untarka.c) +fltk_wrap_ui(FGAdminUI fgadmin.fl) +add_library(FGAdminUI ${FGAdminUI_FLTK_UI_SRCS}) -target_link_libraries(fgadmin +add_executable(fgadmin fgadmin_funcs.cxx main.cxx untarka.c) +add_dependencies(fgadmin FGAdminUI) + +target_link_libraries(fgadmin FGAdminUI ${SIMGEAR_LIBRARIES} ${ZLIB_LIBRARIES} ${PLIB_LIBRARIES} From 86bb7f39f99ca826305f8d8bc8d9cbe88aa21728 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Fri, 28 Jan 2011 20:15:43 +0100 Subject: [PATCH 07/16] Ignore a generated file --- src/Main/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Main/.gitignore b/src/Main/.gitignore index d0c58f586..d176671ce 100644 --- a/src/Main/.gitignore +++ b/src/Main/.gitignore @@ -3,3 +3,4 @@ metar runfgfs runfgfs.bat flightgear.aps +flightgear64.aps From 2ea7f87ae1a73f8a493ee201d29ebd3a388b8baa Mon Sep 17 00:00:00 2001 From: James Turner Date: Sat, 29 Jan 2011 16:05:02 +0000 Subject: [PATCH 08/16] Andreas Gaeb: make input (joystick) re-init work. --- src/Input/FGJoystickInput.cxx | 8 ++++++++ src/Input/FGJoystickInput.hxx | 1 + 2 files changed, 9 insertions(+) diff --git a/src/Input/FGJoystickInput.cxx b/src/Input/FGJoystickInput.cxx index 349782d5b..17f1f3557 100644 --- a/src/Input/FGJoystickInput.cxx +++ b/src/Input/FGJoystickInput.cxx @@ -119,6 +119,14 @@ void FGJoystickInput::init() } } +void FGJoystickInput::reinit() { + SG_LOG(SG_INPUT, SG_DEBUG, "Re-Initializing joystick bindings"); + SGPropertyNode * js_nodes = fgGetNode("/input/joysticks", true); + js_nodes->removeChildren("js", false); + FGJoystickInput::init(); + FGJoystickInput::postinit(); +} + void FGJoystickInput::postinit() { FGNasalSys *nasalsys = (FGNasalSys *)globals->get_subsystem("nasal"); diff --git a/src/Input/FGJoystickInput.hxx b/src/Input/FGJoystickInput.hxx index ef1530ec0..039401e29 100644 --- a/src/Input/FGJoystickInput.hxx +++ b/src/Input/FGJoystickInput.hxx @@ -44,6 +44,7 @@ public: virtual void init(); virtual void postinit(); + virtual void reinit(); virtual void update( double dt ); static const int MAX_JOYSTICKS = 10; From 287cc74965e11ff3888117a9d9b88ed2bdbb9252 Mon Sep 17 00:00:00 2001 From: Erik Hofman Date: Sun, 30 Jan 2011 11:04:37 +0100 Subject: [PATCH 09/16] Fix for bug #204 and #222 by Bertrand Coconnier; NaNs (bug #222) were basically generated because the method JSBSim::unbind() was not implemented in JSBSim.cxx. --- src/FDM/JSBSim/JSBSim.cxx | 47 +++++++++++++++----------- src/FDM/JSBSim/JSBSim.hxx | 5 +-- src/FDM/JSBSim/models/FGPropulsion.cpp | 8 +++-- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx index f802c8c2e..a9e9be771 100644 --- a/src/FDM/JSBSim/JSBSim.cxx +++ b/src/FDM/JSBSim/JSBSim.cxx @@ -144,8 +144,6 @@ FGJSBsim::FGJSBsim( double dt ) } } - resetPropertyState(); - fdmex = new FGFDMExec( (FGPropertyManager*)globals->get_props() ); // Register ground callback. @@ -424,6 +422,33 @@ void FGJSBsim::init() /******************************************************************************/ +void checkTied ( FGPropertyManager *node ) +{ + int N = node->nChildren(); + string name; + + for (int i=0; igetChild(i)->nChildren() ) { + checkTied( (FGPropertyManager*)node->getChild(i) ); + } + if ( node->getChild(i)->isTied() ) { + name = ((FGPropertyManager*)node->getChild(i))->GetFullyQualifiedName(); + node->Untie(name); + } + } +} + +/******************************************************************************/ + +void FGJSBsim::unbind() +{ + SGPropertyNode* instance = globals->get_props()->getNode("/fdm/jsbsim"); + checkTied((FGPropertyManager*)instance); + FGInterface::unbind(); +} + +/******************************************************************************/ + // Run an iteration of the EOM (equations of motion) void FGJSBsim::update( double dt ) @@ -1415,21 +1440,3 @@ void FGJSBsim::update_external_forces(double t_off) fgSetDouble("/fdm/jsbsim/systems/hook/tailhook-pos-deg", fi); } -void FGJSBsim::resetPropertyState() -{ -// this code works-around bug #222: -// http://code.google.com/p/flightgear-bugs/issues/detail?id=222 -// for whatever reason, having an existing value for the WOW -// property causes the NaNs. Should that be fixed, this code can die - SGPropertyNode* gear = fgGetNode("/fdm/jsbsim/gear", false); - if (!gear) { - return; - } - - int index = 0; - SGPropertyNode* unitNode = NULL; - for (; (unitNode = gear->getChild("unit", index)) != NULL; ++index) { - unitNode->removeChild("WOW", 0, false); - } -} - diff --git a/src/FDM/JSBSim/JSBSim.hxx b/src/FDM/JSBSim/JSBSim.hxx index 1a8037167..a01146bcc 100644 --- a/src/FDM/JSBSim/JSBSim.hxx +++ b/src/FDM/JSBSim/JSBSim.hxx @@ -110,6 +110,9 @@ public: /// Reset flight params to a specific position void init(); + /// Unbind properties + void unbind(); + /// @name Position Parameter Set //@{ /** Set geocentric latitude @@ -283,8 +286,6 @@ private: void update_gear(void); void update_external_forces(double t_off); - - void resetPropertyState(); }; diff --git a/src/FDM/JSBSim/models/FGPropulsion.cpp b/src/FDM/JSBSim/models/FGPropulsion.cpp index 57d2852f3..05a2da4c4 100644 --- a/src/FDM/JSBSim/models/FGPropulsion.cpp +++ b/src/FDM/JSBSim/models/FGPropulsion.cpp @@ -307,18 +307,23 @@ bool FGPropulsion::Load(Element* el) try { if (type == "piston_engine") { HavePistonEngine = true; + if (!IsBound) bind(); Engines.push_back(new FGPiston(FDMExec, document, numEngines)); } else if (type == "turbine_engine") { HaveTurbineEngine = true; + if (!IsBound) bind(); Engines.push_back(new FGTurbine(FDMExec, document, numEngines)); } else if (type == "turboprop_engine") { HaveTurboPropEngine = true; + if (!IsBound) bind(); Engines.push_back(new FGTurboProp(FDMExec, document, numEngines)); } else if (type == "rocket_engine") { HaveRocketEngine = true; + if (!IsBound) bind(); Engines.push_back(new FGRocket(FDMExec, document, numEngines)); } else if (type == "electric_engine") { HaveElectricEngine = true; + if (!IsBound) bind(); Engines.push_back(new FGElectric(FDMExec, document, numEngines)); } else { cerr << "Unknown engine type: " << type << endl; @@ -345,7 +350,6 @@ bool FGPropulsion::Load(Element* el) if (el->FindElement("dump-rate")) DumpRate = el->FindElementValueAsNumberConvertTo("dump-rate", "LBS/MIN"); - if (!IsBound) bind(); PostLoad(el, PropertyManager); return true; @@ -642,7 +646,7 @@ void FGPropulsion::bind(void) typedef int (FGPropulsion::*iPMF)(void) const; IsBound = true; - PropertyManager->Tie("propulsion/set-running", this, (iPMF)0, &FGPropulsion::InitRunning, true); + PropertyManager->Tie("propulsion/set-running", this, (iPMF)0, &FGPropulsion::InitRunning, false); if (HaveTurbineEngine) { PropertyManager->Tie("propulsion/starter_cmd", this, (iPMF)0, &FGPropulsion::SetStarter, true); PropertyManager->Tie("propulsion/cutoff_cmd", this, (iPMF)0, &FGPropulsion::SetCutoff, true); From 32b69f823abd9d9adf99c2cf9aa6bf98f5f780bb Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sun, 30 Jan 2011 16:05:28 +0100 Subject: [PATCH 10/16] Betrand Coconnier: fix bugs #47,#184: roll/pitch/speed via command-line Specifying initial roll, pitch and speed should be working again. --- src/FDM/flight.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/FDM/flight.cxx b/src/FDM/flight.cxx index 5676e688b..d501d1507 100644 --- a/src/FDM/flight.cxx +++ b/src/FDM/flight.cxx @@ -268,15 +268,15 @@ FGInterface::bind () // Orientation fgTie("/orientation/roll-deg", this, &FGInterface::get_Phi_deg, - &FGInterface::set_Phi_deg); + &FGInterface::set_Phi_deg, false); fgSetArchivable("/orientation/roll-deg"); fgTie("/orientation/pitch-deg", this, &FGInterface::get_Theta_deg, - &FGInterface::set_Theta_deg); + &FGInterface::set_Theta_deg, false); fgSetArchivable("/orientation/pitch-deg"); fgTie("/orientation/heading-deg", this, &FGInterface::get_Psi_deg, - &FGInterface::set_Psi_deg); + &FGInterface::set_Psi_deg, false); fgSetArchivable("/orientation/heading-deg"); fgTie("/orientation/track-deg", this, &FGInterface::get_Track); @@ -331,11 +331,11 @@ FGInterface::bind () // LaRCSim are fixed (LaRCSim adds the // earth's rotation to the east velocity). fgTie("/velocities/speed-north-fps", this, - &FGInterface::get_V_north, &FGInterface::set_V_north); + &FGInterface::get_V_north, &FGInterface::set_V_north, false); fgTie("/velocities/speed-east-fps", this, - &FGInterface::get_V_east, &FGInterface::set_V_east); + &FGInterface::get_V_east, &FGInterface::set_V_east, false); fgTie("/velocities/speed-down-fps", this, - &FGInterface::get_V_down, &FGInterface::set_V_down); + &FGInterface::get_V_down, &FGInterface::set_V_down, false); fgTie("/velocities/north-relground-fps", this, &FGInterface::get_V_north_rel_ground); From 91d001ff4ebf78205fd83b2342b1003fb3e35411 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sun, 30 Jan 2011 17:35:07 +0100 Subject: [PATCH 11/16] Fix viewer issue with Tower and Chase View. When looking _at_ a model with an x,y offset of 0, then the view heading has no effect. So, force heading offset property to 0 to keep other property consumers from running incorrect calculations. => Trying to rotate the heading offset in Tower/Chase view no longer rotates the blue sky around the aircraft, though the viewer itself isn't rotating anything. --- src/Main/viewer.cxx | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/Main/viewer.cxx b/src/Main/viewer.cxx index 05816f8bc..a61198d66 100644 --- a/src/Main/viewer.cxx +++ b/src/Main/viewer.cxx @@ -289,7 +289,14 @@ void FGViewer::setHeadingOffset_deg (double heading_offset_deg) { _dirty = true; - _heading_offset_deg = heading_offset_deg; + if (_at_model && (_offset_m.x() == 0.0)&&(_offset_m.y() == 0.0)) + { + /* avoid optical effects (e.g. rotating sky) when looking at something + * with heading offsets x==y==0 (view heading cannot change). */ + _heading_offset_deg = 0.0; + } + else + _heading_offset_deg = heading_offset_deg; } void @@ -317,6 +324,14 @@ void FGViewer::setGoalHeadingOffset_deg (double goal_heading_offset_deg) { _dirty = true; + if (_at_model && (_offset_m.x() == 0.0)&&(_offset_m.y() == 0.0)) + { + /* avoid optical effects (e.g. rotating sky) when looking at something + * with heading offsets x==y==0 (view heading cannot change). */ + _goal_heading_offset_deg = 0.0; + return; + } + _goal_heading_offset_deg = goal_heading_offset_deg; while ( _goal_heading_offset_deg < 0.0 ) { _goal_heading_offset_deg += 360; From f68f300bb33617102944fd9f8e443ff91886ae3a Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Fri, 28 Jan 2011 00:06:23 +0100 Subject: [PATCH 12/16] Proposed fix for #251: Waypoint handling Do not consider destination/runway waypoints as done, when these are far away - even if the course is off by > 90 degrees. --- src/Instrumentation/rnav_waypt_controller.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Instrumentation/rnav_waypt_controller.cxx b/src/Instrumentation/rnav_waypt_controller.cxx index 09ac2b812..278484d0a 100644 --- a/src/Instrumentation/rnav_waypt_controller.cxx +++ b/src/Instrumentation/rnav_waypt_controller.cxx @@ -221,7 +221,7 @@ private: /** * Special controller for runways. For runways, we want very narrow deviation - * contraints, and to understand that any point along the paved area is + * constraints, and to understand that any point along the paved area is * equivalent to being 'at' the runway. */ class RunwayCtl : public WayptController @@ -252,7 +252,7 @@ public: double _courseDev = brg - _targetTrack; SG_NORMALIZE_RANGE(_courseDev, -180.0, 180.0); - if (fabs(_courseDev) > 90.0) { + if ((fabs(_courseDev) > 90.0) && (_distanceM < _rnav->overflightArmDistanceM())) { setDone(); } } From 257e3390c94e52a085c11055be91cd12b65886be Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Sun, 30 Jan 2011 21:14:32 +0100 Subject: [PATCH 13/16] Detect joystick disconnection --- src/Input/FGJoystickInput.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Input/FGJoystickInput.cxx b/src/Input/FGJoystickInput.cxx index 17f1f3557..cf7cc3319 100644 --- a/src/Input/FGJoystickInput.cxx +++ b/src/Input/FGJoystickInput.cxx @@ -275,6 +275,8 @@ void FGJoystickInput::update( double dt ) continue; js->read(&buttons, axis_values); + if (js->notWorking()) // If js is disconnected + continue; // Fire bindings for the axes. for (int j = 0; j < bindings[i].naxes; j++) { From 687be046789e2f509ccf93155456c47f3f463e0c Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Sun, 30 Jan 2011 13:25:12 +0100 Subject: [PATCH 14/16] Reported by cppcheck: fix a memory leak --- src/Model/modelmgr.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx index 3478a68c5..181435ef1 100644 --- a/src/Model/modelmgr.cxx +++ b/src/Model/modelmgr.cxx @@ -83,6 +83,7 @@ FGModelMgr::add_model (SGPropertyNode * node) } catch (const sg_throwable& t) { SG_LOG(SG_GENERAL, SG_ALERT, "Error loading " << path << ":\n " << t.getFormattedMessage() << t.getOrigin()); + delete instance; return; } From a853af5b0ecf072a45ae34ff5e66388df9db6458 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Sun, 30 Jan 2011 13:25:39 +0100 Subject: [PATCH 15/16] Reported by cppcheck: fix an incorrect usage of iterators --- src/Instrumentation/wxradar.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Instrumentation/wxradar.cxx b/src/Instrumentation/wxradar.cxx index 739be4b95..c3b37d2cd 100644 --- a/src/Instrumentation/wxradar.cxx +++ b/src/Instrumentation/wxradar.cxx @@ -610,7 +610,7 @@ wxRadarBg::update_aircraft() diff = _elapsed_time - (*ground_echoes_iterator)->elapsed_time; if( diff > _persistance) { - ground_echoes.erase(ground_echoes_iterator); + ground_echoes.erase(ground_echoes_iterator++); } else { // double test_brg = (*ground_echoes_iterator)->bearing; // double bearing = test_brg * SG_DEGREES_TO_RADIANS; From 6bb8e69b92ce593aede6cf8ecb466c6407579d11 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Sun, 30 Jan 2011 21:20:50 +0100 Subject: [PATCH 16/16] Initialize class member in AIFlightPlan --- src/AIModel/AIFlightPlan.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/AIModel/AIFlightPlan.cxx b/src/AIModel/AIFlightPlan.cxx index 132858850..914f5442c 100644 --- a/src/AIModel/AIFlightPlan.cxx +++ b/src/AIModel/AIFlightPlan.cxx @@ -49,6 +49,7 @@ using std::cerr; FGAIFlightPlan::FGAIFlightPlan() { sid = 0; + wpt_iterator = waypoints.begin(); } FGAIFlightPlan::FGAIFlightPlan(const string& filename) @@ -176,6 +177,7 @@ FGAIFlightPlan::FGAIFlightPlan(FGAIAircraft *ac, else wpt->finished = false; waypoints.push_back(wpt); } // of node loop + wpt_iterator = waypoints.begin(); } catch (const sg_exception &e) { SG_LOG(SG_GENERAL, SG_WARN, "Error reading AI flight plan: " << e.getMessage() << " from " << e.getOrigin());