diff --git a/.gitignore b/.gitignore index e54c63e7e8..775008d505 100644 --- a/.gitignore +++ b/.gitignore @@ -143,3 +143,19 @@ XRSound/ /.ninja_deps # Ignore Matlab log analyzers /*.m +/GravityModels +/Extern +/zlib.lib +/zlib.exp +/zlib.dll.manifest +/zlib.dll +/Orbiter_ng.exe.manifest +/Orbiter.exe.manifest +/LuaInterpreter.dll.manifest +/LuaInline.dll.manifest +/lua.lib +/Lua.Interpreter.exe.manifest +/lua.exp +/lua.dll.manifest +/lua.dll +/Cache/D3D9Client/Shaders diff --git a/Config/ProjectApollo/Earth.cfg b/Config/ProjectApollo/Earth.cfg index d3571a44b6..d605bdde07 100644 --- a/Config/ProjectApollo/Earth.cfg +++ b/Config/ProjectApollo/Earth.cfg @@ -9,8 +9,12 @@ SamplingInterval = 79 ; interpolation sampling interval [s] Mass = 5.973698968e+24 ;Size = 6.378165e6 ; equatorial radius Size = 6.37101e6 ; mean radius -JCoeff = 1082.6269e-6 -2.51e-6 -1.60e-6 -0.15e-6 - ; harmonic coefficients for shape description + +; === Gravity Models === +;JCoeff = 1082.6269e-6 -2.51e-6 -1.60e-6 -0.15e-6 ; harmonic coefficients for shape description +GravModelPath = egm96_to360.tab ; the name of the gravity model file to load, located in /GravityModels +GravCoeffCutoff = 50 ; the maximum number of terms to load. + AlbedoRGB = 0.7 0.85 1.0 ; === Rotation and precession parameters === diff --git a/Config/ProjectApollo/Moon.cfg b/Config/ProjectApollo/Moon.cfg index f02fb918e7..5a312479ee 100644 --- a/Config/ProjectApollo/Moon.cfg +++ b/Config/ProjectApollo/Moon.cfg @@ -6,7 +6,11 @@ ErrorLimit = 1e-5 ; === Physical Parameters === Mass = 7.34763862e+22 ; reverse calculated with Orbiter's gravitational constant to match GSOPs G*M Size = 1.73809e6 ; mean radius -JCoeff = 207.108e-6 -2.1e-5 ; GSOP Colossus 3 + +; === Gravity Models === +; ref: see Doc/Technotes/gravity.pdf for details on implimentation and usage +GravModelPath = jgl165p1.sha ; the name of the gravity model file to load, located in /GravityModels +GravCoeffCutoff = 120 ; the maximum number of terms to load. Default = 10, NASSP uses 120. ; === Rotation and precession parameters === ; ref: see www.orbiter-forum.com/showthread.php?t=8185 diff --git a/Config/ProjectApollo/Sol.cfg b/Config/ProjectApollo/Sol.cfg index c6fd13e33a..ec83efc1de 100644 --- a/Config/ProjectApollo/Sol.cfg +++ b/Config/ProjectApollo/Sol.cfg @@ -7,8 +7,8 @@ Planet2 = Venus Planet3 = ProjectApollo\Earth Earth:Moon1 = ProjectApollo\Moon Planet4 = Mars -Mars:Moon1 = Phobos -Mars:Moon2 = Deimos +;Mars:Moon1 = Phobos +;Mars:Moon2 = Deimos Planet5 = Jupiter Jupiter:Moon1 = Io Jupiter:Moon2 = Europa @@ -22,12 +22,12 @@ Saturn:Moon4 = Dione Saturn:Moon5 = Rhea Saturn:Moon6 = Titan Planet7 = Uranus -Uranus:Moon1 = Miranda -Uranus:Moon2 = Ariel -Uranus:Moon3 = Umbriel -Uranus:Moon4 = Titania -Uranus:Moon5 = Oberon +;Uranus:Moon1 = Miranda +;Uranus:Moon2 = Ariel +;Uranus:Moon3 = Umbriel +;Uranus:Moon4 = Titania +;Uranus:Moon5 = Oberon Planet8 = Neptune -Neptune:Moon1 = Triton -Neptune:Moon2 = Proteus -Neptune:Moon3 = Nereid \ No newline at end of file +;Neptune:Moon1 = Triton +;Neptune:Moon2 = Proteus +;Neptune:Moon3 = Nereid \ No newline at end of file diff --git a/Config/ProjectApollo/Sol_VirtualAGC.cfg b/Config/ProjectApollo/Sol_VirtualAGC.cfg index d04b4dee43..29f66ea6e7 100644 --- a/Config/ProjectApollo/Sol_VirtualAGC.cfg +++ b/Config/ProjectApollo/Sol_VirtualAGC.cfg @@ -7,8 +7,8 @@ Planet2 = Venus Planet3 = ProjectApollo\Earth_VirtualAGC Earth:Moon1 = ProjectApollo\Moon Planet4 = Mars -Mars:Moon1 = Phobos -Mars:Moon2 = Deimos +;Mars:Moon1 = Phobos +;Mars:Moon2 = Deimos Planet5 = Jupiter Jupiter:Moon1 = Io Jupiter:Moon2 = Europa @@ -22,12 +22,12 @@ Saturn:Moon4 = Dione Saturn:Moon5 = Rhea Saturn:Moon6 = Titan Planet7 = Uranus -Uranus:Moon1 = Miranda -Uranus:Moon2 = Ariel -Uranus:Moon3 = Umbriel -Uranus:Moon4 = Titania -Uranus:Moon5 = Oberon +;Uranus:Moon1 = Miranda +;Uranus:Moon2 = Ariel +;Uranus:Moon3 = Umbriel +;Uranus:Moon4 = Titania +;Uranus:Moon5 = Oberon Planet8 = Neptune -Neptune:Moon1 = Triton -Neptune:Moon2 = Proteus -Neptune:Moon3 = Nereid \ No newline at end of file +;Neptune:Moon1 = Triton +;Neptune:Moon2 = Proteus +;Neptune:Moon3 = Nereid \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/ASTP.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/ASTP.vcxproj index 53fac7329e..91d6528ae7 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/ASTP.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/ASTP.vcxproj @@ -5,27 +5,47 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {BAE34D87-5EAE-491C-AE6D-73B6B1E487D2} - 10.0.17763.0 + 10.0 - DynamicLibrary + StaticLibrary + false + MultiByte + v142 + + + StaticLibrary false MultiByte - v141 + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -34,19 +54,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\ASTP\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\ASTP\ + .\$(Configuration)\$(ProjectName)\ false + false + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ @@ -97,6 +135,52 @@ ../../../../../Modules/ProjectApollo/ASTP.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\ASTP/ASTP.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;ASTP_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\ASTP/ASTP.pch + .\Debug\ASTP/ + .\Debug\ASTP/ + .\Debug\ASTP/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/ASTP.dll + true + ;../../../../lib/Lua;../../../../lib;%(AdditionalLibraryDirectories) + true + .\Debug\ASTP/ASTP.pdb + false + + + .\Debug\ASTP/ASTP.lib + msvcirt;%(IgnoreSpecificDefaultLibraries) + + + true + ../../../../../Modules/ProjectApollo/ASTP.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -128,10 +212,10 @@ 0x040c - orbiter.lib;orbitersdk.lib;lua5.1.lib;%(AdditionalDependencies) + orbiter.lib;orbitersdk.lib;lua.lib;%(AdditionalDependencies) ../../../../../Modules/ProjectApollo/ASTP.dll true - ../../../../lib/Lua;../../../../lib;%(AdditionalLibraryDirectories) + ../../../../lib/Lua;../../../../lib;../../../../../%(AdditionalLibraryDirectories) .\Release\ASTP/ASTP.pdb false @@ -146,12 +230,63 @@ ../../../../../Modules/ProjectApollo/NSat1ASTP.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\ASTP/ASTP.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;ASTP_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreaded + true + .\Release\ASTP/ASTP.pch + .\Release\ASTP/ + .\Release\ASTP/ + .\Release\ASTP/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;lua.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/ASTP.dll + true + ../../../../lib/Lua;../../../../lib;../../../../../%(AdditionalLibraryDirectories) + .\Release\ASTP/ASTP.pdb + false + + + .\Release\ASTP/ASTP.lib + msvcirt;%(IgnoreSpecificDefaultLibraries) + /NODEFAULTLIB:MSVCRT %(AdditionalOptions) + + + true + ../../../../../Modules/ProjectApollo/NSat1ASTP.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/ApolloRTCCMFD.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/ApolloRTCCMFD.vcxproj index 03fb0e6cd4..4813f39a43 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/ApolloRTCCMFD.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/ApolloRTCCMFD.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -81,19 +89,30 @@ {3F97A697-44DB-4A22-A5F3-7168A990B3C0} ApolloRTCCMFD - 10.0.17763.0 + 10.0 DynamicLibrary false - v141 + v142 + MultiByte + + + DynamicLibrary + false + v142 MultiByte DynamicLibrary false - v141 + v142 + + + DynamicLibrary + false + v142 @@ -102,19 +121,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/Plugin/ - .\Debug\ApolloRTCCMFD\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/Plugin/ - .\Release\ApolloRTCCMFD\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/Plugin/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/Plugin/ + .\$(Configuration)\$(ProjectName)\ @@ -164,6 +201,51 @@ .\Debug\ApolloRTCCMFD/ApolloRTCCMFD.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\ProjectApolloMFD/ProjectApolloMFD.tlb + + + + + Disabled + ../../../LaunchMFD/libMFD;../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + .\Debug\ApolloRTCCMFD/ApolloRTCCMFD.pch + .\Debug\ApolloRTCCMFD/ + .\Debug\ApolloRTCCMFD/ + .\Debug\ApolloRTCCMFD/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0809 + + + orbiter.lib;orbitersdk.lib;User32.lib;Gdi32.lib;WS2_32.lib;%(AdditionalDependencies) + ../../../../../Modules/Plugin/ApolloRTCCMFD.dll + true + ;../../../../lib/Lua;../../src_sys/PanelSDK;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + MSVCRT;msvcirt;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\ApolloRTCCMFD/ApolloRTCCMFD.pdb + Windows + false + + + .\Debug\ApolloRTCCMFD/ApolloRTCCMFD.lib + + + true + .\Debug\ApolloRTCCMFD/ApolloRTCCMFD.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -214,6 +296,53 @@ .\Release\ApolloRTCCMFD/ApolloRTCCMFD.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\ProjectApolloMFD/ProjectApolloMFD.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\ApolloRTCCMFD/ApolloRTCCMFD.pch + .\Release\ApolloRTCCMFD/ + .\Release\ApolloRTCCMFD/ + .\Release\ApolloRTCCMFD/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + orbiter.lib;orbitersdk.lib;User32.lib;Gdi32.lib;WS2_32.lib;%(AdditionalDependencies) + ../../../../../Modules/Plugin/ApolloRTCCMFD.dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + msvcirt;LIBCMT;%(IgnoreSpecificDefaultLibraries) + .\Release\ApolloRTCCMFD/ApolloRTCCMFD.pdb + Windows + false + + + .\Release\ApolloRTCCMFD/ApolloRTCCMFD.lib + + + true + .\Release\ApolloRTCCMFD/ApolloRTCCMFD.bsc + + diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/CMChute.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/CMChute.vcxproj index 00ea6255ba..29fca9857b 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/CMChute.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/CMChute.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {68F2AA4E-3774-4A03-947D-9890DF0E73C5} CMChute - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\CMChute\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\CMChute\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ @@ -98,6 +136,52 @@ ../../../../../Modules/ProjectApollo/CMChute.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\CMChute/CMChute.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CMChute_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\CMChute/CMChute.pch + .\Debug\CMChute/ + .\Debug\CMChute/ + .\Debug\CMChute/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBC;MSVCRT;msvcirt;libci;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\CMChute/CMChute.pdb + false + + + .\Debug\CMChute/CMChute.lib + + + true + ../../../../../Modules/ProjectApollo/CMChute.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -147,18 +231,72 @@ ../../../../../Modules/ProjectApollo/CMChute.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\CMChute/CMChute.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CMChute_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\CMChute/CMChute.pch + .\Release\CMChute/ + .\Release\CMChute/ + .\Release\CMChute/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + msvcirt;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\CMChute/CMChute.pdb + false + + + .\Release\CMChute/CMChute.lib + + + true + ../../../../../Modules/ProjectApollo/CMChute.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Crawler.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Crawler.vcxproj index 801b86d273..a4ce8548bf 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Crawler.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Crawler.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {BAAA2ADB-0507-4E33-9E80-23CEE3B74E37} Crawler - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\Crawler\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\Crawler\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ @@ -98,6 +136,52 @@ ../../../../../Modules/ProjectApollo/Crawler.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\Crawler/Crawler.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CRAWLER_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\Crawler/Crawler.pch + .\Debug\Crawler/ + .\Debug\Crawler/ + .\Debug\Crawler/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib/Lua;../../../../lib;../../../../XRSound;%(AdditionalLibraryDirectories) + LIBCMT;MSVCIRT;MSVCRT;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\Crawler/Crawler.pdb + false + + + .\Debug\Crawler/Crawler.lib + + + true + ../../../../../Modules/ProjectApollo/Crawler.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -114,7 +198,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;CRAWLER_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\Crawler/Crawler.pch .\Release\Crawler/ @@ -147,24 +231,82 @@ ../../../../../Modules/ProjectApollo/Crawler.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\Crawler/Crawler.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CRAWLER_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\Crawler/Crawler.pch + .\Release\Crawler/ + .\Release\Crawler/ + .\Release\Crawler/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + msvcirt;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\Crawler/Crawler.pdb + false + + + .\Release\Crawler/Crawler.lib + + + true + ../../../../../Modules/ProjectApollo/Crawler.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/EVA.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/EVA.vcxproj index 8750055aad..2f61858c1f 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/EVA.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/EVA.vcxproj @@ -5,27 +5,47 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {4427BC2F-CA34-48A6-8EC3-DF7CAC42F11E} - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -34,19 +54,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Release\EVA\ + .\$(Configuration)\$(ProjectName)\ false + false ../../../../../Modules/ProjectApollo/ - .\Debug\EVA\ + .\$(Configuration)\$(ProjectName)\ true + true + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ @@ -64,7 +102,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;EVA_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\EVA/EVA.pch .\Release\EVA/ @@ -96,6 +134,51 @@ ../../../../../Modules/ProjectApollo/EVA.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\EVA/EVA.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;EVA_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\EVA/EVA.pch + .\Release\EVA/ + .\Release\EVA/ + .\Release\EVA/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;%(AdditionalLibraryDirectories) + .\Release\EVA/EVA.pdb + false + + + .\Release\EVA/EVA.lib + + + true + ../../../../../Modules/ProjectApollo/EVA.bsc + + _DEBUG;%(PreprocessorDefinitions) @@ -144,13 +227,62 @@ ../../../../../Modules/ProjectApollo/EVA.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\EVA/EVA.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;EVA_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\EVA/EVA.pch + .\Debug\EVA/ + .\Debug\EVA/ + .\Debug\EVA/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;%(AdditionalLibraryDirectories) + true + .\Debug\EVA/EVA.pdb + false + + + .\Debug\EVA/EVA.lib + + + true + ../../../../../Modules/ProjectApollo/EVA.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/FloatBag.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/FloatBag.vcxproj index 620fa3367a..ae881153bb 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/FloatBag.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/FloatBag.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {FE06FF4C-6772-48C7-9FFB-BCA00CBA8DA1} FloatBag - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\FloatBag\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\FloatBag\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ @@ -98,6 +136,52 @@ ../../../../../Modules/ProjectApollo/FloatBag.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\FloatBag/FloatBag.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FloatBag_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\FloatBag/FloatBag.pch + .\Debug\FloatBag/ + .\Debug\FloatBag/ + .\Debug\FloatBag/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBC;MSVCRT;msvcirt;libci;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\FloatBag/FloatBag.pdb + false + + + .\Debug\FloatBag/FloatBag.lib + + + true + ../../../../../Modules/ProjectApollo/FloatBag.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -147,18 +231,72 @@ ../../../../../Modules/ProjectApollo/FloatBag.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\FloatBag/FloatBag.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FloatBag_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\FloatBag/FloatBag.pch + .\Release\FloatBag/ + .\Release\FloatBag/ + .\Release\FloatBag/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + msvcirt;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\FloatBag/FloatBag.pdb + false + + + .\Release\FloatBag/FloatBag.lib + + + true + ../../../../../Modules/ProjectApollo/FloatBag.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Floodlight.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Floodlight.vcxproj index 311c2ed7cf..a99a1dfdb9 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Floodlight.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Floodlight.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Floodlight - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\Floodlight\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\Floodlight\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ @@ -98,6 +136,52 @@ ../../../../../Modules/ProjectApollo/Floodlight.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\Floodlight/Floodlight.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Floodlight_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\Floodlight/Floodlight.pch + .\Debug\Floodlight/ + .\Debug\Floodlight/ + .\Debug\Floodlight/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBCMT;MSVCRT;msvcirt;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\Floodlight/Floodlight.pdb + false + + + .\Debug\Floodlight/Floodlight.lib + + + true + ../../../../../Modules/ProjectApollo/Floodlight.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -114,7 +198,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Floodlight_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\Floodlight/Floodlight.pch .\Release\Floodlight/ @@ -147,24 +231,82 @@ ../../../../../Modules/ProjectApollo/Floodlight.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\Floodlight/Floodlight.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Floodlight_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\Floodlight/Floodlight.pch + .\Release\Floodlight/ + .\Release\Floodlight/ + .\Release\Floodlight/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + msvcirt;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\Floodlight/Floodlight.pdb + false + + + .\Release\Floodlight/Floodlight.lib + + + true + ../../../../../Modules/ProjectApollo/Floodlight.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LC34.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LC34.vcxproj index 01cc669743..3a3a264c6e 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LC34.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LC34.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {7347CF0C-0A9B-4987-A811-98E7B8008B0D} LC34 - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\LC34\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\LC34\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ @@ -98,6 +136,52 @@ ../../../../../Modules/ProjectApollo/LC34.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\LC34/LC34.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;LC34_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\LC34/LC34.pch + .\Debug\LC34/ + .\Debug\LC34/ + .\Debug\LC34/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBCMT;MSVCRT;msvcirt;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\LC34/LC34.pdb + false + + + .\Debug\LC34/LC34.lib + + + true + ../../../../../Modules/ProjectApollo/LC34.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -114,7 +198,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LC34_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\LC34/LC34.pch .\Release\LC34/ @@ -147,15 +231,65 @@ ../../../../../Modules/ProjectApollo/LC34.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\LC34/LC34.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;LC34_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\LC34/LC34.pch + .\Release\LC34/ + .\Release\LC34/ + .\Release\LC34/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + msvcirt;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\LC34/LC34.pdb + false + + + .\Release\LC34/LC34.lib + + + true + ../../../../../Modules/ProjectApollo/LC34.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) @@ -164,15 +298,23 @@ %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LC37.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LC37.vcxproj index 62228a52fe..f50ac60ddf 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LC37.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LC37.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {1DE45393-14EC-4D29-A2F8-61FC60C2C286} LC34 - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\LC37\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\LC37\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ @@ -98,6 +136,52 @@ ../../../../../Modules/ProjectApollo/LC37.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\LC34/LC34.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;LC37_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\LC37/LC37.pch + .\Debug\LC37/ + .\Debug\LC37/ + .\Debug\LC37/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBCMT;MSVCRT;msvcirt;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\LC37/LC37.pdb + false + + + .\Debug\LC37/LC37.lib + + + true + ../../../../../Modules/ProjectApollo/LC37.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -114,7 +198,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LC37_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\LC37/LC37.pch .\Release\LC37/ @@ -147,6 +231,52 @@ ../../../../../Modules/ProjectApollo/LC37.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\LC34/LC34.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;LC37_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\LC37/LC37.pch + .\Release\LC37/ + .\Release\LC37/ + .\Release\LC37/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + %(IgnoreSpecificDefaultLibraries) + .\Release\LC37/LC37.pdb + false + + + .\Release\LC37/LC37.lib + + + true + ../../../../../Modules/ProjectApollo/LC37.bsc + + diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LCC.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LCC.vcxproj index ccd317af3a..96551fa74c 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LCC.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LCC.vcxproj @@ -5,14 +5,14 @@ Debug Win32 - - Release - Win32 - Debug x64 + + Release + Win32 + Release x64 @@ -22,33 +22,33 @@ 15.0 {828862FD-26AA-46FB-9F5B-92C6F522FE4F} LCC - 10.0.17763.0 + 10.0 DynamicLibrary true - v141 + v142 + MultiByte + + + DynamicLibrary + true + v142 MultiByte DynamicLibrary false - v141 + v142 false MultiByte - - Application - true - v143 - MultiByte - - Application + DynamicLibrary false - v143 - true + v142 + false MultiByte @@ -59,26 +59,37 @@ - + - + - + ../../../../../Modules/ProjectApollo/ - .\Debug\LCC\ - LCC + .\$(Configuration)\$(ProjectName)\ + $(ProjectName) .dll + + $(ProjectName) + .dll + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ + ../../../../../Modules/ProjectApollo/ - .\Release\LCC\ - LCC + .\$(Configuration)\$(ProjectName)\ + $(ProjectName) + + + $(ProjectName) + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -90,7 +101,7 @@ false OnlyExplicitInline - MultiThreaded + MultiThreadedDLL true .\Release\LCC/LCC.pch .\Release\LCC/ @@ -113,6 +124,38 @@ /ignore:4099 %(AdditionalOptions) + + + Level3 + MaxSpeed + true + false + + + false + OnlyExplicitInline + MultiThreadedDLL + true + .\Release\LCC/LCC.pch + .\Release\LCC/ + .\Release\LCC/ + .\Release\LCC/ + ../../src_aux;../../src_rtccmfd;../../src_sys;../../../../include;../../../../XRSound + DIRECTSOUNDENABLED;WIN32;NDEBUG;_WINDOWS;_USRDLL;MCC_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + + + true + true + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + .\Release\LCC/LCC.pdb + false + .\Release\LCC/LCC.lib + false + ../../../../lib;../../../../XRSound + orbiter.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + Level3 @@ -146,22 +189,30 @@ Level3 Disabled - true - true - - - - - Level3 - MaxSpeed - true - true - true - true + + + false + ProgramDatabase + false + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\LCC/LCC.pch + .\Debug\LCC/ + .\Debug\LCC/ + .\Debug\LCC/ + ../../src_aux;../../src_rtccmfd;../../src_sys;../../../../include;../../../../XRSound + DIRECTSOUNDENABLED;WIN32;_DEBUG;_WINDOWS;_USRDLL;MCC_EXPORTS;%(PreprocessorDefinitions) - true - true + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + .\Debug\LCC/LCC.pdb + false + + + .\Debug\LCC/LCC.lib + false + ../../../../lib;../../../../XRSound + orbiter.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LEM.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LEM.vcxproj index 60525f93b9..e9859e41d0 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LEM.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LEM.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {1E53A199-CCDF-4FCF-B2E8-5F8FF80AFEC8} LEM - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Release\LEM\ + .\$(Configuration)\$(ProjectName)\ false + false ../../../../../Modules/ProjectApollo/ - .\Debug\LEM\ + .\$(Configuration)\$(ProjectName)\ true + true + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ @@ -65,7 +103,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;_USRDLL;LEM_EXPORTS;DIRECTSOUNDENABLED;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\LEM/LEM.pch .\Release\LEM/ @@ -99,6 +137,53 @@ ../../../../../Modules/ProjectApollo/LEM.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\LEM/LEM.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;_USRDLL;LEM_EXPORTS;DIRECTSOUNDENABLED;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\LEM/LEM.pch + .\Release\LEM/ + .\Release\LEM/ + .\Release\LEM/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + PanelSDK.lib;orbiter.lib;orbitersdk.lib;opengl32.lib;glu32.lib;winmm.lib;../../src_aux/dxguid.lib;WS2_32.lib;User32.lib;Gdi32.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + .\Release\PanelSDK;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBC;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\LEM/LEM.pdb + false + + + .\Release\LEM/LEM.lib + false + + + true + ../../../../../Modules/ProjectApollo/LEM.bsc + + _DEBUG;%(PreprocessorDefinitions) @@ -149,16 +234,64 @@ ../../../../../Modules/ProjectApollo/LEM.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\LEM/LEM.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;_USRDLL;LEM_EXPORTS;DIRECTSOUNDENABLED;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\LEM/LEM.pch + .\Debug\LEM/ + .\Debug\LEM/ + .\Debug\LEM/ + true + Level3 + true + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + wsock32.lib;PanelSDK.lib;orbiter.lib;orbitersdk.lib;opengl32.lib;glu32.lib;winmm.lib;../../src_aux/dinput8.lib;../../src_aux/dxguid.lib;WS2_32.lib;User32.lib;Gdi32.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;.\Debug\PanelSDK;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBCMT;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\LEM/LEM.pdb + false + + + .\Debug\LEM/LEM.lib + false + + + true + ../../../../../Modules/ProjectApollo/LEM.bsc + + ProgramDatabase + ProgramDatabase ProgramDatabase + ProgramDatabase - @@ -179,19 +312,29 @@ %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) @@ -200,76 +343,124 @@ %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) @@ -281,99 +472,154 @@ %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) - @@ -607,9 +853,13 @@ %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \Program Files\orbiter-nassp\Orbitersdk\samples\ProjectApollo;%(AdditionalIncludeDirectories) + \Program Files\orbiter-nassp\Orbitersdk\samples\ProjectApollo;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \Program Files\orbiter-nassp\Orbitersdk\samples\ProjectApollo;%(AdditionalIncludeDirectories) + \Program Files\orbiter-nassp\Orbitersdk\samples\ProjectApollo;%(AdditionalIncludeDirectories) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LEM.vcxproj.filters b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LEM.vcxproj.filters index 3d0bd45df9..2e44fc406f 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LEM.vcxproj.filters +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LEM.vcxproj.filters @@ -213,9 +213,6 @@ Source Files - - Source Files - Source Files @@ -431,9 +428,6 @@ Header Files - - Header Files - Header Files diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LES.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LES.vcxproj index 6aea903582..08d08bc1a4 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LES.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LES.vcxproj @@ -5,27 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {0046609E-6A36-4A27-B328-D2291BF4A163} - 10.0.17763.0 + 10.0 + LES DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -34,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\LES\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\LES\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ @@ -97,6 +136,52 @@ ../../../../../Modules/ProjectApollo/LES.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\LES/LES.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;LES_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\LES/LES.pch + .\Debug\LES/ + .\Debug\LES/ + .\Debug\LES/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBC;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\LES/LES.pdb + false + + + .\Debug\LES/LES.lib + + + true + ../../../../../Modules/ProjectApollo/LES.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -113,7 +198,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LES_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\LES/LES.pch .\Release\LES/ @@ -146,6 +231,52 @@ ../../../../../Modules/ProjectApollo/LES.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\LES/LES.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;LES_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\LES/LES.pch + .\Release\LES/ + .\Release\LES/ + .\Release\LES/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBC;%(IgnoreSpecificDefaultLibraries) + .\Release\LES/LES.pdb + false + + + .\Release\LES/LES.lib + + + true + ../../../../../Modules/ProjectApollo/LES.bsc + + diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LEVA.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LEVA.vcxproj index af022f95b5..f1685febbc 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LEVA.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LEVA.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {433314D0-A173-4041-8DB8-7641B7ED4D08} LEVA - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\LEVA\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\LEVA\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ @@ -98,6 +136,52 @@ ../../../../../Modules/ProjectApollo/LEVA.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\LEVA/LEVA.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;_USRDLL;LEVA_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\LEVA/LEVA.pch + .\Debug\LEVA/ + .\Debug\LEVA/ + .\Debug\LEVA/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../..;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBCMT;MSVCIRT;MSVCRT;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\LEVA/LEVA.pdb + false + + + .\Debug\LEVA/LEVA.lib + + + true + ../../../../../Modules/ProjectApollo/LEVA.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -114,7 +198,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;_USRDLL;LEVA_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\LEVA/LEVA.pch .\Release\LEVA/ @@ -147,31 +231,93 @@ ../../../../../Modules/ProjectApollo/LEVA.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\LEVA/LEVA.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;_USRDLL;LEVA_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\LEVA/LEVA.pch + .\Release\LEVA/ + .\Release\LEVA/ + .\Release\LEVA/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + msvcirt;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\LEVA/LEVA.pdb + false + + + .\Release\LEVA/LEVA.lib + + + true + ../../../../../Modules/ProjectApollo/LEVA.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LRV.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LRV.vcxproj index 171670b7c7..ea57dede39 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/LRV.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/LRV.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {C0954BF4-D9FE-40D3-971A-CC70D7E65434} LRV - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Release\LRV\ + .\$(Configuration)\$(ProjectName)\ false + false ../../../../../Modules/ProjectApollo/ - .\Debug\LRV\ + .\$(Configuration)\$(ProjectName)\ true + true + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ @@ -65,7 +103,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;_USRDLL;LRV_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\LRV/LRV.pch .\Release\LRV/ @@ -98,6 +136,52 @@ ../../../../../Modules/ProjectApollo/LRV.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\LRV/LRV.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;_USRDLL;LRV_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\LRV/LRV.pch + .\Release\LRV/ + .\Release\LRV/ + .\Release\LRV/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + msvcirt;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\LRV/LRV.pdb + false + + + .\Release\LRV/LRV.lib + + + true + ../../../../../Modules/ProjectApollo/LRV.bsc + + _DEBUG;%(PreprocessorDefinitions) @@ -147,36 +231,103 @@ ../../../../../Modules/ProjectApollo/LRV.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\LRV/LRV.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;_USRDLL;LRV_EXPORTS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\LRV/LRV.pch + .\Debug\LRV/ + .\Debug\LRV/ + .\Debug\LRV/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBCMT;MSVCIRT;MSVCRT;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\LRV/LRV.pdb + false + + + .\Debug\LRV/LRV.lib + + + true + ../../../../../Modules/ProjectApollo/LRV.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/MCC.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/MCC.vcxproj index cf4bf197a1..24d5655021 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/MCC.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/MCC.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {E38D5A31-C96D-437E-A495-4314EF198CEB} - Saturn5NASP - 10.0.17763.0 + MCC + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,21 +55,41 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\MCC\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\MCC\ + .\$(Configuration)\$(ProjectName)\ false - MCC - MCC + false + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ @@ -99,6 +139,53 @@ ../../../../../Modules/ProjectApollo/MCC.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\Saturn5NASP/Saturn5NASP.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + DIRECTSOUNDENABLED;WIN32;_DEBUG;_WINDOWS;_USRDLL;MCC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + .\Debug\MCC/MCC.pch + .\Debug\MCC/ + .\Debug\MCC/ + .\Debug\MCC/ + true + Level3 + true + ProgramDatabase + EnableFastChecks + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + winmm.lib;PanelSDK.lib;orbiter.lib;orbitersdk.lib;opengl32.lib;glu32.lib;../../src_aux/dinput8.lib;../../src_aux/dxguid.lib;WS2_32.lib;User32.lib;Gdi32.lib;lua.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../..;.\Debug\PanelSDK;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBCMT;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\MCC/MCC.pdb + false + + + .\Debug\MCC/MCC.lib + false + + + true + ../../../../../Modules/ProjectApollo/MCC.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -130,10 +217,10 @@ 0x040c - ../../src_aux/dsound.lib;winmm.lib;PanelSDK.lib;orbiter.lib;orbitersdk.lib;lua5.1.lib;opengl32.lib;glu32.lib;../../src_aux/dinput8.lib;../../src_aux/dxguid.lib;WS2_32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies) + ../../src_aux/dsound.lib;winmm.lib;PanelSDK.lib;orbiter.lib;orbitersdk.lib;lua.lib;opengl32.lib;glu32.lib;../../src_aux/dinput8.lib;../../src_aux/dxguid.lib;WS2_32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies) ../../../../../Modules/ProjectApollo/MCC.dll true - .\Release\PanelSDK;../../../../lib;../../../../XRSound;../../../../lib/Lua;%(AdditionalLibraryDirectories) + .\Release\PanelSDK;../../../../lib;../../../../XRSound;../../../../lib/Lua;../../../../../;%(AdditionalLibraryDirectories) LIBC;LIBCD;libci;%(IgnoreSpecificDefaultLibraries) .\Release\MCC/MCC.pdb false @@ -149,6 +236,53 @@ ../../../../../Modules/ProjectApollo/MCC.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\Saturn5NASP/Saturn5NASP.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + DIRECTSOUNDENABLED;WIN32;NDEBUG;_WINDOWS;_USRDLL;MCC_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\MCC/MCC.pch + .\Release\MCC/ + .\Release\MCC/ + .\Release\MCC/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + ../../src_aux/dsound.lib;winmm.lib;PanelSDK.lib;orbiter.lib;orbitersdk.lib;lua.lib;opengl32.lib;glu32.lib;../../src_aux/dinput8.lib;../../src_aux/dxguid.lib;WS2_32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + .\Release\PanelSDK;../../../../lib;../../../../XRSound;../../../../lib/Lua;../../../../../;%(AdditionalLibraryDirectories) + LIBC;LIBCD;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\MCC/MCC.pdb + false + + + .\Release\MCC/MCC.lib + false + + + true + ../../../../../Modules/ProjectApollo/MCC.bsc + + diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/ML.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/ML.vcxproj index dec5453e45..c616de4baf 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/ML.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/ML.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {D6FBF84B-F71B-4E9E-ABBF-366CA5E1D3B1} ML - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\ML\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\ML\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ @@ -98,6 +136,52 @@ ../../../../../Modules/ProjectApollo/ML.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\ML/ML.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;ML_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\ML/ML.pch + .\Debug\ML/ + .\Debug\ML/ + .\Debug\ML/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBCMT;MSVCRT;msvcirt;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\ML/ML.pdb + false + + + .\Debug\ML/ML.lib + + + true + ../../../../../Modules/ProjectApollo/ML.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -114,7 +198,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ML_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\ML/ML.pch .\Release\ML/ @@ -130,7 +214,7 @@ orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) - ../../../../../Modules/ProjectApollo/ML.dll + ../../../../../Modules/ProjectApollo/$(ProjectName).dll true ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) msvcirt;libci;%(IgnoreSpecificDefaultLibraries) @@ -147,15 +231,65 @@ ../../../../../Modules/ProjectApollo/ML.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\ML/ML.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;ML_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\ML/ML.pch + .\Release\ML/ + .\Release\ML/ + .\Release\ML/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + msvcirt;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\ML/ML.pdb + false + + + .\Release\ML/ML.lib + + + true + ../../../../../Modules/ProjectApollo/ML.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) @@ -166,15 +300,23 @@ %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/MSS.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/MSS.vcxproj index 9f852213d8..78382fced8 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/MSS.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/MSS.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {365AC3FB-ADDB-4176-94B5-C8118A39C37D} MSS - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\MSS\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\MSS\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/ProjectApollo/ @@ -98,6 +136,52 @@ ../../../../../Modules/ProjectApollo/MSS.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\MSS/MSS.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;MSS_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\MSS/MSS.pch + .\Debug\MSS/ + .\Debug\MSS/ + .\Debug\MSS/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBCMT;MSVCRT;msvcirt;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\MSS/MSS.pdb + false + + + .\Debug\MSS/MSS.lib + + + true + ../../../../../Modules/ProjectApollo/MSS.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -114,7 +198,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MSS_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\MSS/MSS.pch .\Release\MSS/ @@ -130,7 +214,7 @@ orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) - ../../../../../Modules/ProjectApollo/MSS.dll + ../../../../../Modules/ProjectApollo/$(ProjectName).dll true ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) msvcirt;libci;%(IgnoreSpecificDefaultLibraries) @@ -147,24 +231,82 @@ ../../../../../Modules/ProjectApollo/MSS.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\MSS/MSS.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;MSS_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\MSS/MSS.pch + .\Release\MSS/ + .\Release\MSS/ + .\Release\MSS/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + msvcirt;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\MSS/MSS.pdb + false + + + .\Release\MSS/MSS.lib + + + true + ../../../../../Modules/ProjectApollo/MSS.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/PanelSDK.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/PanelSDK.vcxproj index 6cf5df4caa..359c46dcc2 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/PanelSDK.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/PanelSDK.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {98EC3BF0-C9FF-4C38-91E1-159D8F3700C1} PanelSDK - 10.0.17763.0 + 10.0 StaticLibrary false MultiByte - v141 + v142 + + + StaticLibrary + false + MultiByte + v142 StaticLibrary false MultiByte - v141 + v142 + + + StaticLibrary + false + MultiByte + v142 @@ -35,17 +55,33 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 - .\Debug\PanelSDK\ - .\Debug\PanelSDK\ - .\Release\PanelSDK\ - .\Release\PanelSDK\ + .\$(Configuration)\PanelSDK\ + .\$(Configuration)\PanelSDK\ + .\$(Configuration)\PanelSDK\ + .\$(Configuration)\PanelSDK\ + + + .\$(Configuration)\PanelSDK\ + .\$(Configuration)\PanelSDK\ + + + .\$(Configuration)\PanelSDK\ + .\$(Configuration)\PanelSDK\ @@ -69,7 +105,36 @@ 0x0409 - .\Debug\PanelSDK\PanelSDK.lib + .\$(Configuration)\$(ProjectName)\$(ProjectName).lib + true + + + true + .\Debug\PanelSDK\PanelSDK.bsc + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\PanelSDK/PanelSDK.pch + .\Debug\PanelSDK/ + .\Debug\PanelSDK/ + .\Debug\PanelSDK/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + .\$(Configuration)\$(ProjectName)\$(ProjectName).lib true @@ -84,7 +149,43 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL + true + NotSet + .\Release\PanelSDK/PanelSDK.pch + .\Release\PanelSDK/ + .\Release\PanelSDK/ + .\Release\PanelSDK/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + .\$(Configuration)\$(ProjectName)\$(ProjectName).lib + %(AdditionalLibraryDirectories) + true + + + true + .\Release\PanelSDK\PanelSDK.bsc + + + Orbiter.lib;Orbitersdk.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ../../../../lib; + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL true NotSet .\Release\PanelSDK/PanelSDK.pch @@ -100,7 +201,7 @@ 0x0409 - .\Release\PanelSDK\PanelSDK.lib + .\$(Configuration)\$(ProjectName)\$(ProjectName).lib %(AdditionalLibraryDirectories) true @@ -108,6 +209,10 @@ true .\Release\PanelSDK\PanelSDK.bsc + + Orbiter.lib;Orbitersdk.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ../../../../lib; + @@ -117,33 +222,53 @@ %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/ProjectApolloConfigurator.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/ProjectApolloConfigurator.vcxproj index 845c91393e..96d59f3e64 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/ProjectApolloConfigurator.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/ProjectApolloConfigurator.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {73EF2265-3791-4C67-89A0-9DA47D663144} ProjectApolloConfigurator - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/Startup/ - .\Release\ProjectApolloConfigurator\ + .\$(Configuration)\$(ProjectName)\ false + false ../../../../../Modules/Startup/ - .\Debug\ProjectApolloConfigurator\ + .\$(Configuration)\$(ProjectName)\ true + true + + + ../../../../../Modules/Startup/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/Startup/ + .\$(Configuration)\$(ProjectName)\ @@ -99,6 +137,53 @@ .\Release\ProjectApolloConfigurator/ProjectApolloConfigurator.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\ProjectApolloConfigurator/ProjectApolloConfigurator.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PROJECTAPOLLOCONFIGURATOR_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\ProjectApolloConfigurator/ProjectApolloConfigurator.pch + .\Release\ProjectApolloConfigurator/ + .\Release\ProjectApolloConfigurator/ + .\Release\ProjectApolloConfigurator/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + orbiter.lib;orbitersdk.lib;../../src_aux/dinput8.lib;../../src_aux/dxguid.lib;User32.lib;Gdi32.lib;WS2_32.lib;%(AdditionalDependencies) + ../../../../../Modules/Startup/ProjectApolloConfigurator.dll + true + ../../../../lib;../../src_aux;%(AdditionalLibraryDirectories) + msvcirt;LIBCMT;%(IgnoreSpecificDefaultLibraries) + .\Release\ProjectApolloConfigurator/ProjectApolloConfigurator.pdb + false + + + .\Release\ProjectApolloConfigurator/ProjectApolloConfigurator.lib + false + + + true + .\Release\ProjectApolloConfigurator/ProjectApolloConfigurator.bsc + + _DEBUG;%(PreprocessorDefinitions) @@ -149,26 +234,79 @@ ../../../../../Modules/Startup/ProjectApolloConfigurator.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\ProjectApolloConfigurator/ProjectApolloConfigurator.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;PROJECTAPOLLOCONFIGURATOR_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\ProjectApolloConfigurator/ProjectApolloConfigurator.pch + .\Debug\ProjectApolloConfigurator/ + .\Debug\ProjectApolloConfigurator/ + .\Debug\ProjectApolloConfigurator/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0809 + + + orbiter.lib;orbitersdk.lib;User32.lib;Gdi32.lib;../../src_aux/dinput8.lib;../../src_aux/dxguid.lib;WS2_32.lib;%(AdditionalDependencies) + ../../../../../Modules/Startup/ProjectApolloConfigurator.dll + true + ;../../../../lib/Lua;../../../../lib;%(AdditionalLibraryDirectories) + MSVCRT;msvcirt;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\ProjectApolloConfigurator/ProjectApolloConfigurator.pdb + false + + + .\Debug\ProjectApolloConfigurator/ProjectApolloConfigurator.lib + false + + + true + ../../../../../Modules/Startup/ProjectApolloConfigurator.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) - %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \Dokumente und Einstellungen\mjoachim\Eigene Dateien\Games\ProjectApollo\Orbiter\Orbitersdk\samples\ProjectApollo\ProjectApolloConfigurator;%(AdditionalIncludeDirectories) + \Dokumente und Einstellungen\mjoachim\Eigene Dateien\Games\ProjectApollo\Orbiter\Orbitersdk\samples\ProjectApollo\ProjectApolloConfigurator;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \Dokumente und Einstellungen\mjoachim\Eigene Dateien\Games\ProjectApollo\Orbiter\Orbitersdk\samples\ProjectApollo\ProjectApolloConfigurator;%(AdditionalIncludeDirectories) + \Dokumente und Einstellungen\mjoachim\Eigene Dateien\Games\ProjectApollo\Orbiter\Orbitersdk\samples\ProjectApollo\ProjectApolloConfigurator;%(AdditionalIncludeDirectories) - diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/ProjectApolloConfigurator.vcxproj.filters b/Orbitersdk/samples/ProjectApollo/Build/VC2017/ProjectApolloConfigurator.vcxproj.filters index 0fa29982cf..3a21b21177 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/ProjectApolloConfigurator.vcxproj.filters +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/ProjectApolloConfigurator.vcxproj.filters @@ -18,9 +18,6 @@ Source Files - - Source Files - @@ -31,8 +28,5 @@ Header Files - - Header Files - \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/ProjectApolloMFD.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/ProjectApolloMFD.vcxproj index 8bf56af10d..a01ab220ab 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/ProjectApolloMFD.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/ProjectApolloMFD.vcxproj @@ -5,26 +5,44 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {91D2B2E0-D1EC-45B5-AEF4-52D1273652FD} ProjectApolloMFD - 10.0.17763.0 + 10.0 DynamicLibrary false - v141 + v142 + + + DynamicLibrary + false + v142 DynamicLibrary false - v141 + v142 + + + DynamicLibrary + false + v142 @@ -33,19 +51,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/Plugin/ - .\Debug\ProjectApolloMFD\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/Plugin/ - .\Release\ProjectApolloMFD\ + .\$(Configuration)\$(ProjectName)\ false + false + + + .\$(Configuration)\$(ProjectName)\ + ../../../../../Modules/Plugin/ + + + ../../../../../Modules/Plugin/ + .\$(Configuration)\$(ProjectName)\ @@ -95,6 +131,51 @@ .\Debug\ProjectApolloMFD/ProjectApolloMFD.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\ProjectApolloMFD/ProjectApolloMFD.tlb + + + + + Disabled + ../../src_rtccmfd;../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + .\Debug\ProjectApolloMFD/ProjectApolloMFD.pch + .\Debug\ProjectApolloMFD/ + .\Debug\ProjectApolloMFD/ + .\Debug\ProjectApolloMFD/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0809 + + + orbiter.lib;orbitersdk.lib;User32.lib;Gdi32.lib;WS2_32.lib;%(AdditionalDependencies) + ../../../../../Modules/Plugin/ProjectApolloMFD.dll + true + ;../../../../lib/Lua;../../src_sys/PanelSDK;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + MSVCRT;msvcirt;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\ProjectApolloMFD/ProjectApolloMFD.pdb + Windows + false + + + .\Debug\ProjectApolloMFD/ProjectApolloMFD.lib + + + true + .\Debug\ProjectApolloMFD/ProjectApolloMFD.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -145,6 +226,53 @@ .\Release\ProjectApolloMFD/ProjectApolloMFD.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\ProjectApolloMFD/ProjectApolloMFD.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_rtccmfd;../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\ProjectApolloMFD/ProjectApolloMFD.pch + .\Release\ProjectApolloMFD/ + .\Release\ProjectApolloMFD/ + .\Release\ProjectApolloMFD/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + orbiter.lib;orbitersdk.lib;User32.lib;Gdi32.lib;WS2_32.lib;%(AdditionalDependencies) + ../../../../../Modules/Plugin/ProjectApolloMFD.dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + msvcirt;LIBCMT;%(IgnoreSpecificDefaultLibraries) + .\Release\ProjectApolloMFD/ProjectApolloMFD.pdb + Windows + false + + + .\Release\ProjectApolloMFD/ProjectApolloMFD.lib + + + true + .\Release\ProjectApolloMFD/ProjectApolloMFD.bsc + + @@ -162,9 +290,13 @@ %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) @@ -175,9 +307,13 @@ %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/SIVb.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/SIVb.vcxproj index a09da61919..626056d733 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/SIVb.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/SIVb.vcxproj @@ -5,27 +5,47 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {1FD6B39B-FC9F-4219-AB56-4F7D698EEEC4} - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -34,19 +54,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\SIVb\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\SIVb\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -97,6 +135,52 @@ ../../../../../Modules/ProjectApollo/SIVb.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\SIVb/SIVb.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SIVB_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\SIVb/SIVb.pch + .\Debug\SIVb/ + .\Debug\SIVb/ + .\Debug\SIVb/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + PanelSDK.lib;orbiter.lib;orbitersdk.lib;opengl32.lib;glu32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;.\Debug\PanelSDK;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBC;LIBCD;libci;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\SIVb/SIVb.pdb + false + + + .\Debug\SIVb/SIVb.lib + + + true + ../../../../../Modules/ProjectApollo/SIVb.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -113,7 +197,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SIVB_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\SIVb/SIVb.pch .\Release\SIVb/ @@ -128,10 +212,10 @@ 0x040c - PanelSDK.lib;orbiter.lib;orbitersdk.lib;opengl32.lib;glu32.lib;lua5.1.lib;User32.lib;Gdi32.lib;XRSound.lib;%(AdditionalDependencies) + PanelSDK.lib;orbiter.lib;orbitersdk.lib;opengl32.lib;glu32.lib;lua.lib;User32.lib;Gdi32.lib;XRSound.lib;%(AdditionalDependencies) ../../../../../Modules/ProjectApollo/SIVb.dll true - .\Release\PanelSDK;../../../../lib;../../../../XRSound;../../../../lib/Lua;%(AdditionalLibraryDirectories) + .\Release\PanelSDK;../../../../lib;../../../../XRSound;../../../../lib/Lua;../../../../../;%(AdditionalLibraryDirectories) libci;%(IgnoreSpecificDefaultLibraries) .\Release\SIVb/SIVb.pdb false @@ -146,6 +230,52 @@ ../../../../../Modules/ProjectApollo/SIVb.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\SIVb/SIVb.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SIVB_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\SIVb/SIVb.pch + .\Release\SIVb/ + .\Release\SIVb/ + .\Release\SIVb/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + PanelSDK.lib;orbiter.lib;orbitersdk.lib;opengl32.lib;glu32.lib;lua.lib;User32.lib;Gdi32.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + .\Release\PanelSDK;../../../../lib;../../../../XRSound;../../../../lib/Lua;../../../../../;%(AdditionalLibraryDirectories) + libci;%(IgnoreSpecificDefaultLibraries) + .\Release\SIVb/SIVb.pdb + false + + + .\Release\SIVb/SIVb.lib + + + true + ../../../../../Modules/ProjectApollo/SIVb.bsc + + @@ -165,9 +295,13 @@ %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat1Abort1.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat1Abort1.vcxproj index 902ad0bd5a..19d2dca6d3 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat1Abort1.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat1Abort1.vcxproj @@ -5,27 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {1C98109C-791B-4563-AA9C-D02963D2AEC1} - 10.0.17763.0 + 10.0 + Sat1bAbort1 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -34,21 +55,41 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\Sat1Abort1\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\Sat1Abort1\ + .\$(Configuration)\$(ProjectName)\ false - Sat1bAbort1 - Sat1bAbort1 + false + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -98,6 +139,51 @@ ../../../../../Modules/ProjectApollo/Sat1bAbort1.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\Sat1Abort1/Sat1Abort1.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SAT1ABORT1_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\Sat1Abort1/Sat1Abort1.pch + .\Debug\Sat1Abort1/ + .\Debug\Sat1Abort1/ + .\Debug\Sat1Abort1/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + true + .\Debug\Sat1Abort1/Sat1bAbort1.pdb + false + + + .\Debug\Sat1Abort1/Sat1bAbort1.lib + + + true + ../../../../../Modules/ProjectApollo/Sat1bAbort1.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -114,7 +200,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SAT1ABORT1_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\Sat1Abort1/Sat1Abort1.pch .\Release\Sat1Abort1/ @@ -146,12 +232,61 @@ ../../../../../Modules/ProjectApollo/Sat1bAbort1.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\Sat1Abort1/Sat1Abort1.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SAT1ABORT1_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\Sat1Abort1/Sat1Abort1.pch + .\Release\Sat1Abort1/ + .\Release\Sat1Abort1/ + .\Release\Sat1Abort1/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + .\Release\Sat1Abort1/Sat1bAbort1.pdb + false + + + .\Release\Sat1Abort1/Sat1bAbort1.lib + + + true + ../../../../../Modules/ProjectApollo/Sat1bAbort1.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat1Abort2.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat1Abort2.vcxproj index fe41c2dfcf..268fe5e1aa 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat1Abort2.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat1Abort2.vcxproj @@ -5,27 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {D62F2884-7E90-4A13-B41D-1BCFFCB6F6C6} - 10.0.17763.0 + 10.0 + Sat1bAbort2 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -34,21 +55,41 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Release\Sat1Abort2\ + .\$(Configuration)\$(ProjectName)\ false + false ../../../../../Modules/ProjectApollo/ - .\Debug\Sat1Abort2\ + .\$(Configuration)\$(ProjectName)\ true - Sat1bAbort2 - Sat1bAbort2 + true + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -66,7 +107,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SAT1ABORT2_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\Sat1Abort2/Sat1Abort2.pch .\Release\Sat1Abort2/ @@ -98,6 +139,51 @@ ../../../../../Modules/ProjectApollo/Sat1bAbort2.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\Sat1Abort2/Sat1Abort2.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SAT1ABORT2_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\Sat1Abort2/Sat1Abort2.pch + .\Release\Sat1Abort2/ + .\Release\Sat1Abort2/ + .\Release\Sat1Abort2/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + .\Release\Sat1Abort2/Sat1bAbort2.pdb + false + + + .\Release\Sat1Abort2/Sat1bAbort2.lib + + + true + ../../../../../Modules/ProjectApollo/Sat1bAbort2.bsc + + _DEBUG;%(PreprocessorDefinitions) @@ -146,12 +232,61 @@ ../../../../../Modules/ProjectApollo/Sat1bAbort2.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\Sat1Abort2/Sat1Abort2.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SAT1ABORT2_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\Sat1Abort2/Sat1Abort2.pch + .\Debug\Sat1Abort2/ + .\Debug\Sat1Abort2/ + .\Debug\Sat1Abort2/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + true + .\Debug\Sat1Abort2/Sat1bAbort2.pdb + false + + + .\Debug\Sat1Abort2/Sat1bAbort2.lib + + + true + ../../../../../Modules/ProjectApollo/Sat1bAbort2.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5Abort1.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5Abort1.vcxproj index 51fa92ecb4..fe16034c05 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5Abort1.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5Abort1.vcxproj @@ -5,27 +5,47 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {BD695BAF-A2E9-4E65-804A-CEBB4A45DF78} - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -34,19 +54,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\Sat5Abort1\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\Sat5Abort1\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -96,6 +134,51 @@ ../../../../../Modules/ProjectApollo/Sat5Abort1.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\Sat5Abort1/Sat5Abort1.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SAT5ABORT1_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\Sat5Abort1/Sat5Abort1.pch + .\Debug\Sat5Abort1/ + .\Debug\Sat5Abort1/ + .\Debug\Sat5Abort1/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + true + .\Debug\Sat5Abort1/Sat5Abort1.pdb + false + + + .\Debug\Sat5Abort1/Sat5Abort1.lib + + + true + ../../../../../Modules/ProjectApollo/Sat5Abort1.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -112,7 +195,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SAT5ABORT1_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\Sat5Abort1/Sat5Abort1.pch .\Release\Sat5Abort1/ @@ -144,12 +227,61 @@ ../../../../../Modules/ProjectApollo/Sat5Abort1.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\Sat5Abort1/Sat5Abort1.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SAT5ABORT1_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\Sat5Abort1/Sat5Abort1.pch + .\Release\Sat5Abort1/ + .\Release\Sat5Abort1/ + .\Release\Sat5Abort1/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + .\Release\Sat5Abort1/Sat5Abort1.pdb + false + + + .\Release\Sat5Abort1/Sat5Abort1.lib + + + true + ../../../../../Modules/ProjectApollo/Sat5Abort1.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5Abort2.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5Abort2.vcxproj index 2540c6badf..d8f8ed8f75 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5Abort2.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5Abort2.vcxproj @@ -5,27 +5,47 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {CCCE5F37-9749-4E83-A9F5-893855CD1850} - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -34,19 +54,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Release\Sat5Abort2\ + .\$(Configuration)\$(ProjectName)\ false + false ../../../../../Modules/ProjectApollo/ - .\Debug\Sat5Abort2\ + .\$(Configuration)\$(ProjectName)\ true + true + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -64,7 +102,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SAT5ABORT2_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\Sat5Abort2/Sat5Abort2.pch .\Release\Sat5Abort2/ @@ -96,6 +134,51 @@ ../../../../../Modules/ProjectApollo/Sat5Abort2.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\Sat5Abort2/Sat5Abort2.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SAT5ABORT2_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\Sat5Abort2/Sat5Abort2.pch + .\Release\Sat5Abort2/ + .\Release\Sat5Abort2/ + .\Release\Sat5Abort2/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + .\Release\Sat5Abort2/Sat5Abort2.pdb + false + + + .\Release\Sat5Abort2/Sat5Abort2.lib + + + true + ../../../../../Modules/ProjectApollo/Sat5Abort2.bsc + + _DEBUG;%(PreprocessorDefinitions) @@ -144,12 +227,61 @@ ../../../../../Modules/ProjectApollo/Sat5Abort2.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\Sat5Abort2/Sat5Abort2.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SAT5ABORT2_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\Sat5Abort2/Sat5Abort2.pch + .\Debug\Sat5Abort2/ + .\Debug\Sat5Abort2/ + .\Debug\Sat5Abort2/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + true + .\Debug\Sat5Abort2/Sat5Abort2.pdb + false + + + .\Debug\Sat5Abort2/Sat5Abort2.lib + + + true + ../../../../../Modules/ProjectApollo/Sat5Abort2.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5Abort3.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5Abort3.vcxproj index a03bd86155..4b764c79f7 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5Abort3.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5Abort3.vcxproj @@ -5,27 +5,47 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {16DA84DA-79DC-4631-B5A6-4D31433433AD} - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -34,19 +54,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Release\Sat5Abort3\ + .\$(Configuration)\$(ProjectName)\ false + false ../../../../../Modules/ProjectApollo/ - .\Debug\Sat5Abort3\ + .\$(Configuration)\$(ProjectName)\ true + true + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -64,7 +102,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Sat5Abort3_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\Sat5Abort3/Sat5Abort3.pch .\Release\Sat5Abort3/ @@ -96,6 +134,51 @@ ../../../../../Modules/ProjectApollo/Sat5Abort3.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\Sat5Abort3/Sat5Abort3.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Sat5Abort3_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\Sat5Abort3/Sat5Abort3.pch + .\Release\Sat5Abort3/ + .\Release\Sat5Abort3/ + .\Release\Sat5Abort3/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + .\Release\Sat5Abort3/Sat5Abort3.pdb + false + + + .\Release\Sat5Abort3/Sat5Abort3.lib + + + true + ../../../../../Modules/ProjectApollo/Sat5Abort3.bsc + + _DEBUG;%(PreprocessorDefinitions) @@ -144,13 +227,62 @@ ../../../../../Modules/ProjectApollo/Sat5Abort3.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\Sat5Abort3/Sat5Abort3.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Sat5Abort3_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\Sat5Abort3/Sat5Abort3.pch + .\Debug\Sat5Abort3/ + .\Debug\Sat5Abort3/ + .\Debug\Sat5Abort3/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + true + .\Debug\Sat5Abort3/Sat5Abort3.pdb + false + + + .\Debug\Sat5Abort3/Sat5Abort3.lib + + + true + ../../../../../Modules/ProjectApollo/Sat5Abort3.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5LMDSC.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5LMDSC.vcxproj index 34792e9ceb..f44f35893d 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5LMDSC.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Sat5LMDSC.vcxproj @@ -5,27 +5,47 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {A3B0AACD-C28C-4E02-9385-901383E91AF5} - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -34,19 +54,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\Sat5LMDSC\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\Sat5LMDSC\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -96,6 +134,51 @@ ../../../../../Modules/ProjectApollo/Sat5LMDSC.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\Sat5LMDSC/Sat5LMDSC.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Sat5LMDSC_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\Sat5LMDSC/Sat5LMDSC.pch + .\Debug\Sat5LMDSC/ + .\Debug\Sat5LMDSC/ + .\Debug\Sat5LMDSC/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + true + .\Debug\Sat5LMDSC/Sat5LMDSC.pdb + false + + + .\Debug\Sat5LMDSC/Sat5LMDSC.lib + + + true + ../../../../../Modules/ProjectApollo/Sat5LMDSC.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -112,7 +195,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_lm;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Sat5LMDSC_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\Sat5LMDSC/Sat5LMDSC.pch .\Release\Sat5LMDSC/ @@ -144,13 +227,62 @@ ../../../../../Modules/ProjectApollo/Sat5LMDSC.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\Sat5LMDSC/Sat5LMDSC.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_lm;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Sat5LMDSC_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\Sat5LMDSC/Sat5LMDSC.pch + .\Release\Sat5LMDSC/ + .\Release\Sat5LMDSC/ + .\Release\Sat5LMDSC/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + .\Release\Sat5LMDSC/Sat5LMDSC.pdb + false + + + .\Release\Sat5LMDSC/Sat5LMDSC.lib + + + true + ../../../../../Modules/ProjectApollo/Sat5LMDSC.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn1b.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn1b.vcxproj index 4351d5b855..31b5a93810 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn1b.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn1b.vcxproj @@ -1,30 +1,48 @@ - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {1151EE87-AB2E-4ABD-B0EB-EC5974A0BC9A} Saturn1b - 10.0.17763.0 + 10.0 DynamicLibrary false - v141 + v142 + + + DynamicLibrary + false + v142 DynamicLibrary false - v141 + v142 + + + DynamicLibrary + false + v142 @@ -33,19 +51,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\Saturn1b\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\Saturn1b\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -96,6 +132,54 @@ ../../../../../Modules/ProjectApollo/Saturn1b.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\Saturn1b/Saturn1b.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + .\Debug\Saturn1b/Saturn1b.pch + .\Debug\Saturn1b/ + .\Debug\Saturn1b/ + .\Debug\Saturn1b/ + true + Level3 + true + ProgramDatabase + EnableFastChecks + + + _DEBUG;%(PreprocessorDefinitions) + 0x0809 + + + winmm.lib;PanelSDK.lib;orbiter.lib;orbitersdk.lib;opengl32.lib;glu32.lib;../../src_aux/dinput8.lib;../../src_aux/dxguid.lib;WS2_32.lib;User32.lib;Gdi32.lib;lua.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../..;.\Debug\PanelSDK;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBCMT;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\Saturn1b/Saturn1b.pdb + Windows + false + + + .\Debug\Saturn1b/Saturn1b.lib + false + + + true + ../../../../../Modules/ProjectApollo/Saturn1b.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -112,7 +196,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\Saturn1b/Saturn1b.pch .\Release\Saturn1b/ @@ -127,10 +211,10 @@ 0x0809 - ../../src_aux/dsound.lib;winmm.lib;PanelSDK.lib;orbiter.lib;orbitersdk.lib;lua5.1.lib;opengl32.lib;glu32.lib;../../src_aux/dinput8.lib;../../src_aux/dxguid.lib;WS2_32.lib;User32.lib;Gdi32.lib;XRSound.lib;%(AdditionalDependencies) + ../../src_aux/dsound.lib;winmm.lib;PanelSDK.lib;orbiter.lib;orbitersdk.lib;lua.lib;opengl32.lib;glu32.lib;../../src_aux/dinput8.lib;../../src_aux/dxguid.lib;WS2_32.lib;User32.lib;Gdi32.lib;XRSound.lib;%(AdditionalDependencies) ../../../../../Modules/ProjectApollo/Saturn1b.dll true - .\Release\PanelSDK;../../../../lib/Lua;../../../../lib;../../../../XRSound;%(AdditionalLibraryDirectories) + .\Release\PanelSDK;../../../../lib/Lua;../../../../lib;../../../../XRSound;../../../../../;%(AdditionalLibraryDirectories) LIBC;msvcirt;libci;%(IgnoreSpecificDefaultLibraries) .\Release\Saturn1b/Saturn1b.pdb Windows @@ -149,13 +233,62 @@ ../../../../../Modules/ProjectApollo/Saturn1b.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\Saturn1b/Saturn1b.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\Saturn1b/Saturn1b.pch + .\Release\Saturn1b/ + .\Release\Saturn1b/ + .\Release\Saturn1b/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + winmm.lib;PanelSDK.lib;orbiter.lib;orbitersdk.lib;lua.lib;opengl32.lib;glu32.lib;WS2_32.lib;User32.lib;Gdi32.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + .\Release\PanelSDK;../../../../lib/Lua;../../../../lib;../../../../XRSound;../../../../../;%(AdditionalLibraryDirectories) + LIBC;msvcirt;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\Saturn1b/Saturn1b.pdb + Windows + false + + + .\Release\Saturn1b/Saturn1b.lib + false + true + true + + + true + ../../../../../Modules/ProjectApollo/Saturn1b.bsc + + - @@ -174,6 +307,7 @@ ProgramDatabase + ProgramDatabase @@ -181,119 +315,189 @@ %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase ProgramDatabase + ProgramDatabase ProgramDatabase + ProgramDatabase ProgramDatabase + ProgramDatabase ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase ProgramDatabase + ProgramDatabase ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase ProgramDatabase + ProgramDatabase ProgramDatabase + ProgramDatabase @@ -301,159 +505,266 @@ %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) @@ -463,7 +774,6 @@ - @@ -654,9 +964,13 @@ %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \Program Files\orbiter-nassp\Orbitersdk\samples\ProjectApollo;%(AdditionalIncludeDirectories) + \Program Files\orbiter-nassp\Orbitersdk\samples\ProjectApollo;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \Program Files\orbiter-nassp\Orbitersdk\samples\ProjectApollo;%(AdditionalIncludeDirectories) + \Program Files\orbiter-nassp\Orbitersdk\samples\ProjectApollo;%(AdditionalIncludeDirectories) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn1b.vcxproj.filters b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn1b.vcxproj.filters index c87d2e1aa2..4aa8588399 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn1b.vcxproj.filters +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn1b.vcxproj.filters @@ -228,9 +228,6 @@ Source Files - - Source Files - Source Files @@ -455,9 +452,6 @@ Header Files - - Header Files - Header Files diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn5NASP.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn5NASP.vcxproj index ba49fa7183..1c774171c9 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn5NASP.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn5NASP.vcxproj @@ -1,32 +1,53 @@ - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {5AE2D199-E94E-4E65-A0F5-7242EE0227E9} - Saturn5NASP - 10.0.17763.0 + Saturn5 + 10.0 + Saturn5 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,21 +56,41 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\Saturn5NASP\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\Saturn5NASP\ + .\$(Configuration)\$(ProjectName)\ false - Saturn5 - Saturn5 + false + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -99,6 +140,53 @@ ../../../../../Modules/ProjectApollo/Saturn5.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\Saturn5NASP/Saturn5NASP.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + DIRECTSOUNDENABLED;WIN32;_DEBUG;_WINDOWS;_USRDLL;SATURN5NASP_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + .\Debug\Saturn5NASP/Saturn5NASP.pch + .\Debug\Saturn5NASP/ + .\Debug\Saturn5NASP/ + .\Debug\Saturn5NASP/ + true + Level3 + true + ProgramDatabase + EnableFastChecks + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + winmm.lib;PanelSDK.lib;orbiter.lib;orbitersdk.lib;opengl32.lib;glu32.lib;../../src_aux/dinput8.lib;../../src_aux/dxguid.lib;WS2_32.lib;User32.lib;Gdi32.lib;lua.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../..;.\Debug\PanelSDK;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBCMT;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\Saturn5NASP/Saturn5.pdb + false + + + .\Debug\Saturn5NASP/Saturn5.lib + false + + + true + ../../../../../Modules/ProjectApollo/Saturn5.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -115,7 +203,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) DIRECTSOUNDENABLED;WIN32;NDEBUG;_WINDOWS;_USRDLL;SATURN5NASP_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\Saturn5NASP/Saturn5NASP.pch .\Release\Saturn5NASP/ @@ -124,17 +212,17 @@ Level3 true true - stdcpp14 + Default NDEBUG;%(PreprocessorDefinitions) 0x040c - ../../src_aux/dsound.lib;winmm.lib;PanelSDK.lib;orbiter.lib;orbitersdk.lib;lua5.1.lib;opengl32.lib;glu32.lib;../../src_aux/dinput8.lib;../../src_aux/dxguid.lib;WS2_32.lib;User32.lib;Gdi32.lib;XRSound.lib;%(AdditionalDependencies) + ../../src_aux/dsound.lib;winmm.lib;PanelSDK.lib;orbiter.lib;orbitersdk.lib;lua.lib;opengl32.lib;glu32.lib;../../src_aux/dinput8.lib;../../src_aux/dxguid.lib;WS2_32.lib;User32.lib;Gdi32.lib;XRSound.lib;%(AdditionalDependencies) ../../../../../Modules/ProjectApollo/Saturn5.dll true - .\Release\PanelSDK;../../../../lib;../../../../XRSound;../../../../lib/Lua;%(AdditionalLibraryDirectories) + .\Release\PanelSDK;../../../../lib;../../../../XRSound;../../../../lib/Lua;../../../../../;%(AdditionalLibraryDirectories) LIBC;LIBCD;libci;%(IgnoreSpecificDefaultLibraries) .\Release\Saturn5NASP/Saturn5.pdb false @@ -150,13 +238,60 @@ ../../../../../Modules/ProjectApollo/Saturn5.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\Saturn5NASP/Saturn5NASP.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + DIRECTSOUNDENABLED;WIN32;NDEBUG;_WINDOWS;_USRDLL;SATURN5NASP_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\Saturn5NASP/Saturn5NASP.pch + .\Release\Saturn5NASP/ + .\Release\Saturn5NASP/ + .\Release\Saturn5NASP/ + Level3 + true + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + winmm.lib;PanelSDK.lib;orbiter.lib;orbitersdk.lib;lua.lib;opengl32.lib;glu32.lib;WS2_32.lib;User32.lib;Gdi32.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + .\Release\PanelSDK;../../../../lib;../../../../XRSound;../../../../lib/Lua;../../../../../;%(AdditionalLibraryDirectories) + LIBC;LIBCD;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\Saturn5NASP/Saturn5.pdb + false + + + .\Release\Saturn5NASP/Saturn5.lib + false + + + true + ../../../../../Modules/ProjectApollo/Saturn5.bsc + + - @@ -175,6 +310,7 @@ ProgramDatabase + ProgramDatabase @@ -182,20 +318,31 @@ %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase ProgramDatabase + ProgramDatabase %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ProgramDatabase + ProgramDatabase @@ -204,67 +351,107 @@ %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) @@ -274,138 +461,226 @@ %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) @@ -415,7 +690,6 @@ - @@ -614,9 +888,13 @@ %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \Program Files\orbiter-nassp\Orbitersdk\samples\ProjectApollo;%(AdditionalIncludeDirectories) + \Program Files\orbiter-nassp\Orbitersdk\samples\ProjectApollo;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \Program Files\orbiter-nassp\Orbitersdk\samples\ProjectApollo;%(AdditionalIncludeDirectories) + \Program Files\orbiter-nassp\Orbitersdk\samples\ProjectApollo;%(AdditionalIncludeDirectories) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn5NASP.vcxproj.filters b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn5NASP.vcxproj.filters index 58dcd3ec32..5dca2a3367 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn5NASP.vcxproj.filters +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Saturn5NASP.vcxproj.filters @@ -228,9 +228,6 @@ Source Files - - Source Files - Source Files @@ -473,9 +470,6 @@ Header Files - - Header Files - Header Files diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Skylab.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Skylab.vcxproj index c918f10010..08ebaa2c3d 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/Skylab.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/Skylab.vcxproj @@ -5,14 +5,14 @@ Debug Win32 - - Release - Win32 - Debug x64 + + Release + Win32 + Release x64 @@ -41,34 +41,34 @@ Win32Proj {123bd935-cdf4-440c-b113-db3448b08de8} Skylab - 10.0.17763.0 + 10.0 DynamicLibrary true - v141 + v142 MultiByte - + DynamicLibrary - false - v141 - false + true + v142 MultiByte - + DynamicLibrary - true + false v142 - Unicode + false + MultiByte DynamicLibrary false v142 - true - Unicode + false + MultiByte @@ -78,31 +78,35 @@ - + - + - + true ../../../../../Modules/ProjectApollo/ - .\Debug\Skylab\ + .\$(Configuration)\$(ProjectName)\ + + + true + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ false ../../../../../Modules/ProjectApollo/ - .\Release\Skylab\ - - - true + .\$(Configuration)\$(ProjectName)\ false + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -131,6 +135,32 @@ PanelSDK.lib;orbiter.lib;orbitersdk.lib;opengl32.lib;glu32.lib;lua5.1.lib;User32.lib;Gdi32.lib;XRSoundD.lib;%(AdditionalDependencies) + + + Level3 + + + _DEBUG;WIN32;_WINDOWS;_USRDLL;LEM_EXPORTS;DIRECTSOUNDENABLED;%(PreprocessorDefinitions) + false + NotUsing + stdafx.h + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + .\Debug\LEM/LEM.pch + .\Debug\Skylab/ + .\Debug\Skylab/ + .\Debug\Skylab/ + true + + + Windows + true + false + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + ;../../../../..;.\Debug\PanelSDK;../../../../lib;../../../../XRSound;%(AdditionalLibraryDirectories) + PanelSDK.lib;orbiter.lib;orbitersdk.lib;opengl32.lib;glu32.lib;lua.lib;User32.lib;Gdi32.lib;XRSound.lib;%(AdditionalDependencies) + + Level3 @@ -142,10 +172,9 @@ false NotUsing pch.h - - + Default ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound;%(AdditionalIncludeDirectories) - MultiThreaded + MultiThreadedDLL .\Release\Skylab\ .\Release\Skylab\ .\Release\Skylab\ @@ -163,8 +192,8 @@ DebugFull true ../../../../../Modules/ProjectApollo/Skylab.dll - .\Release\PanelSDK;../../../../lib;../../../../XRSound;../../../../lib/Lua;%(AdditionalLibraryDirectories) - PanelSDK.lib;orbiter.lib;orbitersdk.lib;opengl32.lib;glu32.lib;lua5.1.lib;User32.lib;Gdi32.lib;XRSound.lib;%(AdditionalDependencies) + .\Release\PanelSDK;../../../../lib;../../../../XRSound;../../../../lib/Lua;../../../../../;%(AdditionalLibraryDirectories) + PanelSDK.lib;orbiter.lib;orbitersdk.lib;opengl32.lib;glu32.lib;lua.lib;User32.lib;Gdi32.lib;XRSound.lib;%(AdditionalDependencies) LIBC;LIBCD;libci;%(IgnoreSpecificDefaultLibraries) .\Release\Skylab/Skylab.pdb @@ -173,38 +202,46 @@ /ignore:4099 %(AdditionalOptions) - - - Level3 - true - _DEBUG;SKYLAB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - Use - pch.h - - - Windows - true - false - - Level3 true - true - true - NDEBUG;SKYLAB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - Use + false + + + WIN32;NDEBUG;_WINDOWS;_USRDLL;SIVB_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + false + NotUsing pch.h + Default + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound;%(AdditionalIncludeDirectories) + MultiThreadedDLL + .\Release\Skylab\ + .\Release\Skylab\ + .\Release\Skylab\ + true + true + OnlyExplicitInline - Windows - true - true - true - false + + + + + + + DebugFull + true + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + .\Release\PanelSDK;../../../../lib;../../../../XRSound;../../../../lib/Lua;../../../../../;%(AdditionalLibraryDirectories) + PanelSDK.lib;orbiter.lib;orbitersdk.lib;opengl32.lib;glu32.lib;lua.lib;User32.lib;Gdi32.lib;XRSound.lib;%(AdditionalDependencies) + LIBC;LIBCD;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\Skylab/Skylab.pdb + + + + + .\Release\Skylab/Skylab.lib diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/VAB.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/VAB.vcxproj index ea35273f9f..c5c2cef8e6 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/VAB.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/VAB.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {9A4119F5-6936-4C1A-8A40-EBDA0808348A} VAB - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Release\VAB\ + .\$(Configuration)\$(ProjectName)\ false + false ../../../../../Modules/ProjectApollo/ - .\Debug\VAB\ + .\$(Configuration)\$(ProjectName)\ true + true + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -65,7 +103,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VAB_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\VAB/VAB.pch .\Release\VAB/ @@ -98,6 +136,52 @@ ../../../../../Modules/ProjectApollo/VAB.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\VAB/VAB.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;VAB_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\VAB/VAB.pch + .\Release\VAB/ + .\Release\VAB/ + .\Release\VAB/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + msvcirt;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\VAB/VAB.pdb + false + + + .\Release\VAB/VAB.lib + + + true + ../../../../../Modules/ProjectApollo/VAB.bsc + + _DEBUG;%(PreprocessorDefinitions) @@ -147,30 +231,92 @@ ../../../../../Modules/ProjectApollo/VAB.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\VAB/VAB.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;VAB_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\VAB/VAB.pch + .\Debug\VAB/ + .\Debug\VAB/ + .\Debug\VAB/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + D:\PA\Orbitersdk\lib\Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBCMT;MSVCRT;msvcirt;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\VAB/VAB.pdb + false + + + .\Debug\VAB/VAB.lib + + + true + ../../../../../Modules/ProjectApollo/VAB.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/s1b.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/s1b.vcxproj index 386c536637..dac20bb2b0 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/s1b.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/s1b.vcxproj @@ -5,27 +5,47 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {0A2BCE86-18E7-43DF-9BBF-F11EA7EB3469} - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -34,19 +54,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Release\s1b\ + .\$(Configuration)\$(ProjectName)\ false + false ../../../../../Modules/ProjectApollo/ - .\Debug\s1b\ + .\$(Configuration)\$(ProjectName)\ true + true + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -64,7 +102,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;s1b_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\s1b/s1b.pch .\Release\s1b/ @@ -97,6 +135,52 @@ ../../../../../Modules/ProjectApollo/s1b.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\s1b/s1b.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;s1b_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\s1b/s1b.pch + .\Release\s1b/ + .\Release\s1b/ + .\Release\s1b/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;PanelSDK.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound;.\Release\PanelSDK;%(AdditionalLibraryDirectories) + LIBC;%(IgnoreSpecificDefaultLibraries) + .\Release\s1b/s1b.pdb + false + + + .\Release\s1b/s1b.lib + + + true + ../../../../../Modules/ProjectApollo/s1b.bsc + + _DEBUG;%(PreprocessorDefinitions) @@ -146,12 +230,62 @@ ../../../../../Modules/ProjectApollo/s1b.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\s1b/s1b.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;s1b_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\s1b/s1b.pch + .\Debug\s1b/ + .\Debug\s1b/ + .\Debug\s1b/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;PanelSDK.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib/Lua;../../../../lib;../../../../XRSound;Debug\PanelSDK;%(AdditionalLibraryDirectories) + LIBC;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\s1b/s1b.pdb + false + + + .\Debug\s1b/s1b.lib + + + true + ../../../../../Modules/ProjectApollo/s1b.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/s1c.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/s1c.vcxproj index c4251474e9..a98c78ce1c 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/s1c.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/s1c.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {6CD92808-91D8-4A49-BCF9-6FADD43FBC83} s1c - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\s1c\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\s1c\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -98,6 +136,52 @@ ../../../../../Modules/ProjectApollo/s1c.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\s1c/s1c.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;s1c_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\s1c/s1c.pch + .\Debug\s1c/ + .\Debug\s1c/ + .\Debug\s1c/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBCMT;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\s1c/s1c.pdb + false + + + .\Debug\s1c/s1c.lib + + + true + ../../../../../Modules/ProjectApollo/s1c.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -114,7 +198,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;s1c_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\s1c/s1c.pch .\Release\s1c/ @@ -150,12 +234,65 @@ ../../../../../Modules/ProjectApollo/s1c.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\s1c/s1c.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;s1c_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\s1c/s1c.pch + .\Release\s1c/ + .\Release\s1c/ + .\Release\s1c/ + + + .\Release\s1c/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBC;msvcirt;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\s1c/s1c.pdb + false + + + .\Release\s1c/s1c.lib + + + true + ../../../../../Modules/ProjectApollo/s1c.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/sii.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/sii.vcxproj index a43bf4b261..3f438f4cca 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/sii.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/sii.vcxproj @@ -5,27 +5,47 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {D09FA383-CE66-4640-B8A8-0EA789A8D34A} - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -34,19 +54,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\sii\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\sii\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -97,6 +135,52 @@ ../../../../../Modules/ProjectApollo/sii.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\sii/sii.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../Sound/OrbiterSound_SDK/VESSELSOUND_SDK/ShuttlePB_project;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;sii_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\sii/sii.pch + .\Debug\sii/ + .\Debug\sii/ + .\Debug\sii/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBC;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\sii/sii.pdb + false + + + .\Debug\sii/sii.lib + + + true + ../../../../../Modules/ProjectApollo/sii.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -113,7 +197,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;sii_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\sii/sii.pch .\Release\sii/ @@ -146,12 +230,62 @@ ../../../../../Modules/ProjectApollo/sii.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\sii/sii.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;sii_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\sii/sii.pch + .\Release\sii/ + .\Release\sii/ + .\Release\sii/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBC;%(IgnoreSpecificDefaultLibraries) + .\Release\sii/sii.pdb + false + + + .\Release\sii/sii.lib + + + true + ../../../../../Modules/ProjectApollo/sii.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/Build/VC2017/sm.vcxproj b/Orbitersdk/samples/ProjectApollo/Build/VC2017/sm.vcxproj index 4ab5062e1b..fda11529a0 100644 --- a/Orbitersdk/samples/ProjectApollo/Build/VC2017/sm.vcxproj +++ b/Orbitersdk/samples/ProjectApollo/Build/VC2017/sm.vcxproj @@ -5,28 +5,48 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {D1B7F820-4A7A-47CB-BDB2-62E8B8C29F61} sm - 10.0.17763.0 + 10.0 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 DynamicLibrary false MultiByte - v141 + v142 + + + DynamicLibrary + false + MultiByte + v142 @@ -35,19 +55,37 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 ../../../../../Modules/ProjectApollo/ - .\Debug\sm\ + .\$(Configuration)\$(ProjectName)\ true + true ../../../../../Modules/ProjectApollo/ - .\Release\sm\ + .\$(Configuration)\$(ProjectName)\ false + false + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ + + + ../../../../../Modules/ProjectApollo/ + .\$(Configuration)\$(ProjectName)\ @@ -98,6 +136,52 @@ ../../../../../Modules/ProjectApollo/sm.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug\sm/sm.tlb + + + + + Disabled + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;sm_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\Debug\sm/sm.pch + .\Debug\sm/ + .\Debug\sm/ + .\Debug\sm/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ;../../../../lib/Lua;../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBCMT;%(IgnoreSpecificDefaultLibraries) + true + .\Debug\sm/SM.pdb + false + + + .\Debug\sm/SM.lib + + + true + ../../../../../Modules/ProjectApollo/sm.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -114,7 +198,7 @@ ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;sm_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS true - MultiThreaded + MultiThreadedDLL true .\Release\sm/sm.pch .\Release\sm/ @@ -147,12 +231,62 @@ ../../../../../Modules/ProjectApollo/sm.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release\sm/sm.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../src_aux;../../src_sys;../../src_mfd;../../src_lm;../../src_moon;../../src_csm;../../src_launch;../../src_landing;../../src_saturn;../../../../include;../../../../XRSound%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;sm_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + MultiThreadedDLL + true + .\Release\sm/sm.pch + .\Release\sm/ + .\Release\sm/ + .\Release\sm/ + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + orbiter.lib;orbitersdk.lib;XRSound.lib;%(AdditionalDependencies) + ../../../../../Modules/ProjectApollo/$(ProjectName).dll + true + ../../../../lib;../../../../XRSound%(AdditionalLibraryDirectories) + LIBC;LIBCD;libci;%(IgnoreSpecificDefaultLibraries) + .\Release\sm/SM.pdb + false + + + .\Release\sm/SM.lib + + + true + ../../../../../Modules/ProjectApollo/sm.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/Orbitersdk/samples/ProjectApollo/ProjectApollo2017.sln b/Orbitersdk/samples/ProjectApollo/ProjectApollo.sln similarity index 78% rename from Orbitersdk/samples/ProjectApollo/ProjectApollo2017.sln rename to Orbitersdk/samples/ProjectApollo/ProjectApollo.sln index 0b2f36fe31..3a9e602f95 100644 --- a/Orbitersdk/samples/ProjectApollo/ProjectApollo2017.sln +++ b/Orbitersdk/samples/ProjectApollo/ProjectApollo.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.8.34525.116 +VisualStudioVersion = 17.8.34322.80 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASTP", "Build\VC2017\ASTP.vcxproj", "{BAE34D87-5EAE-491C-AE6D-73B6B1E487D2}" EndProject @@ -22,9 +22,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LEM", "Build\VC2017\LEM.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SIVb", "Build\VC2017\SIVb.vcxproj", "{1FD6B39B-FC9F-4219-AB56-4F7D698EEEC4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sat1Abort1", "Build\VC2017\Sat1Abort1.vcxproj", "{1C98109C-791B-4563-AA9C-D02963D2AEC1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sat1bAbort1", "Build\VC2017\Sat1Abort1.vcxproj", "{1C98109C-791B-4563-AA9C-D02963D2AEC1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sat1Abort2", "Build\VC2017\Sat1Abort2.vcxproj", "{D62F2884-7E90-4A13-B41D-1BCFFCB6F6C6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sat1bAbort2", "Build\VC2017\Sat1Abort2.vcxproj", "{D62F2884-7E90-4A13-B41D-1BCFFCB6F6C6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sat5Abort1", "Build\VC2017\Sat5Abort1.vcxproj", "{BD695BAF-A2E9-4E65-804A-CEBB4A45DF78}" EndProject @@ -32,7 +32,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sat5Abort2", "Build\VC2017\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Saturn1b", "Build\VC2017\Saturn1b.vcxproj", "{1151EE87-AB2E-4ABD-B0EB-EC5974A0BC9A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Saturn5NASP", "Build\VC2017\Saturn5NASP.vcxproj", "{5AE2D199-E94E-4E65-A0F5-7242EE0227E9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Saturn5", "Build\VC2017\Saturn5NASP.vcxproj", "{5AE2D199-E94E-4E65-A0F5-7242EE0227E9}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EVA", "Build\VC2017\EVA.vcxproj", "{4427BC2F-CA34-48A6-8EC3-DF7CAC42F11E}" EndProject @@ -92,202 +92,268 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {BAE34D87-5EAE-491C-AE6D-73B6B1E487D2}.Debug|Win32.ActiveCfg = Debug|Win32 {BAE34D87-5EAE-491C-AE6D-73B6B1E487D2}.Debug|Win32.Build.0 = Debug|Win32 - {BAE34D87-5EAE-491C-AE6D-73B6B1E487D2}.Debug|x64.ActiveCfg = Debug|Win32 + {BAE34D87-5EAE-491C-AE6D-73B6B1E487D2}.Debug|x64.ActiveCfg = Debug|x64 + {BAE34D87-5EAE-491C-AE6D-73B6B1E487D2}.Debug|x64.Build.0 = Debug|x64 {BAE34D87-5EAE-491C-AE6D-73B6B1E487D2}.Release|Win32.ActiveCfg = Release|Win32 {BAE34D87-5EAE-491C-AE6D-73B6B1E487D2}.Release|Win32.Build.0 = Release|Win32 - {BAE34D87-5EAE-491C-AE6D-73B6B1E487D2}.Release|x64.ActiveCfg = Release|Win32 + {BAE34D87-5EAE-491C-AE6D-73B6B1E487D2}.Release|x64.ActiveCfg = Release|x64 + {BAE34D87-5EAE-491C-AE6D-73B6B1E487D2}.Release|x64.Build.0 = Release|x64 {BAAA2ADB-0507-4E33-9E80-23CEE3B74E37}.Debug|Win32.ActiveCfg = Debug|Win32 {BAAA2ADB-0507-4E33-9E80-23CEE3B74E37}.Debug|Win32.Build.0 = Debug|Win32 - {BAAA2ADB-0507-4E33-9E80-23CEE3B74E37}.Debug|x64.ActiveCfg = Debug|Win32 + {BAAA2ADB-0507-4E33-9E80-23CEE3B74E37}.Debug|x64.ActiveCfg = Debug|x64 + {BAAA2ADB-0507-4E33-9E80-23CEE3B74E37}.Debug|x64.Build.0 = Debug|x64 {BAAA2ADB-0507-4E33-9E80-23CEE3B74E37}.Release|Win32.ActiveCfg = Release|Win32 {BAAA2ADB-0507-4E33-9E80-23CEE3B74E37}.Release|Win32.Build.0 = Release|Win32 - {BAAA2ADB-0507-4E33-9E80-23CEE3B74E37}.Release|x64.ActiveCfg = Release|Win32 + {BAAA2ADB-0507-4E33-9E80-23CEE3B74E37}.Release|x64.ActiveCfg = Release|x64 + {BAAA2ADB-0507-4E33-9E80-23CEE3B74E37}.Release|x64.Build.0 = Release|x64 {C0954BF4-D9FE-40D3-971A-CC70D7E65434}.Debug|Win32.ActiveCfg = Debug|Win32 {C0954BF4-D9FE-40D3-971A-CC70D7E65434}.Debug|Win32.Build.0 = Debug|Win32 - {C0954BF4-D9FE-40D3-971A-CC70D7E65434}.Debug|x64.ActiveCfg = Debug|Win32 + {C0954BF4-D9FE-40D3-971A-CC70D7E65434}.Debug|x64.ActiveCfg = Debug|x64 + {C0954BF4-D9FE-40D3-971A-CC70D7E65434}.Debug|x64.Build.0 = Debug|x64 {C0954BF4-D9FE-40D3-971A-CC70D7E65434}.Release|Win32.ActiveCfg = Release|Win32 {C0954BF4-D9FE-40D3-971A-CC70D7E65434}.Release|Win32.Build.0 = Release|Win32 - {C0954BF4-D9FE-40D3-971A-CC70D7E65434}.Release|x64.ActiveCfg = Release|Win32 + {C0954BF4-D9FE-40D3-971A-CC70D7E65434}.Release|x64.ActiveCfg = Release|x64 + {C0954BF4-D9FE-40D3-971A-CC70D7E65434}.Release|x64.Build.0 = Release|x64 {D6FBF84B-F71B-4E9E-ABBF-366CA5E1D3B1}.Debug|Win32.ActiveCfg = Debug|Win32 {D6FBF84B-F71B-4E9E-ABBF-366CA5E1D3B1}.Debug|Win32.Build.0 = Debug|Win32 - {D6FBF84B-F71B-4E9E-ABBF-366CA5E1D3B1}.Debug|x64.ActiveCfg = Debug|Win32 + {D6FBF84B-F71B-4E9E-ABBF-366CA5E1D3B1}.Debug|x64.ActiveCfg = Debug|x64 + {D6FBF84B-F71B-4E9E-ABBF-366CA5E1D3B1}.Debug|x64.Build.0 = Debug|x64 {D6FBF84B-F71B-4E9E-ABBF-366CA5E1D3B1}.Release|Win32.ActiveCfg = Release|Win32 {D6FBF84B-F71B-4E9E-ABBF-366CA5E1D3B1}.Release|Win32.Build.0 = Release|Win32 - {D6FBF84B-F71B-4E9E-ABBF-366CA5E1D3B1}.Release|x64.ActiveCfg = Release|Win32 + {D6FBF84B-F71B-4E9E-ABBF-366CA5E1D3B1}.Release|x64.ActiveCfg = Release|x64 + {D6FBF84B-F71B-4E9E-ABBF-366CA5E1D3B1}.Release|x64.Build.0 = Release|x64 {365AC3FB-ADDB-4176-94B5-C8118A39C37D}.Debug|Win32.ActiveCfg = Debug|Win32 {365AC3FB-ADDB-4176-94B5-C8118A39C37D}.Debug|Win32.Build.0 = Debug|Win32 - {365AC3FB-ADDB-4176-94B5-C8118A39C37D}.Debug|x64.ActiveCfg = Debug|Win32 + {365AC3FB-ADDB-4176-94B5-C8118A39C37D}.Debug|x64.ActiveCfg = Debug|x64 + {365AC3FB-ADDB-4176-94B5-C8118A39C37D}.Debug|x64.Build.0 = Debug|x64 {365AC3FB-ADDB-4176-94B5-C8118A39C37D}.Release|Win32.ActiveCfg = Release|Win32 {365AC3FB-ADDB-4176-94B5-C8118A39C37D}.Release|Win32.Build.0 = Release|Win32 - {365AC3FB-ADDB-4176-94B5-C8118A39C37D}.Release|x64.ActiveCfg = Release|Win32 + {365AC3FB-ADDB-4176-94B5-C8118A39C37D}.Release|x64.ActiveCfg = Release|x64 + {365AC3FB-ADDB-4176-94B5-C8118A39C37D}.Release|x64.Build.0 = Release|x64 {98EC3BF0-C9FF-4C38-91E1-159D8F3700C1}.Debug|Win32.ActiveCfg = Debug|Win32 {98EC3BF0-C9FF-4C38-91E1-159D8F3700C1}.Debug|Win32.Build.0 = Debug|Win32 - {98EC3BF0-C9FF-4C38-91E1-159D8F3700C1}.Debug|x64.ActiveCfg = Debug|Win32 + {98EC3BF0-C9FF-4C38-91E1-159D8F3700C1}.Debug|x64.ActiveCfg = Debug|x64 + {98EC3BF0-C9FF-4C38-91E1-159D8F3700C1}.Debug|x64.Build.0 = Debug|x64 {98EC3BF0-C9FF-4C38-91E1-159D8F3700C1}.Release|Win32.ActiveCfg = Release|Win32 {98EC3BF0-C9FF-4C38-91E1-159D8F3700C1}.Release|Win32.Build.0 = Release|Win32 - {98EC3BF0-C9FF-4C38-91E1-159D8F3700C1}.Release|x64.ActiveCfg = Release|Win32 + {98EC3BF0-C9FF-4C38-91E1-159D8F3700C1}.Release|x64.ActiveCfg = Release|x64 + {98EC3BF0-C9FF-4C38-91E1-159D8F3700C1}.Release|x64.Build.0 = Release|x64 {1E53A199-CCDF-4FCF-B2E8-5F8FF80AFEC8}.Debug|Win32.ActiveCfg = Debug|Win32 {1E53A199-CCDF-4FCF-B2E8-5F8FF80AFEC8}.Debug|Win32.Build.0 = Debug|Win32 - {1E53A199-CCDF-4FCF-B2E8-5F8FF80AFEC8}.Debug|x64.ActiveCfg = Debug|Win32 + {1E53A199-CCDF-4FCF-B2E8-5F8FF80AFEC8}.Debug|x64.ActiveCfg = Debug|x64 + {1E53A199-CCDF-4FCF-B2E8-5F8FF80AFEC8}.Debug|x64.Build.0 = Debug|x64 {1E53A199-CCDF-4FCF-B2E8-5F8FF80AFEC8}.Release|Win32.ActiveCfg = Release|Win32 {1E53A199-CCDF-4FCF-B2E8-5F8FF80AFEC8}.Release|Win32.Build.0 = Release|Win32 - {1E53A199-CCDF-4FCF-B2E8-5F8FF80AFEC8}.Release|x64.ActiveCfg = Release|Win32 + {1E53A199-CCDF-4FCF-B2E8-5F8FF80AFEC8}.Release|x64.ActiveCfg = Release|x64 + {1E53A199-CCDF-4FCF-B2E8-5F8FF80AFEC8}.Release|x64.Build.0 = Release|x64 {1FD6B39B-FC9F-4219-AB56-4F7D698EEEC4}.Debug|Win32.ActiveCfg = Debug|Win32 {1FD6B39B-FC9F-4219-AB56-4F7D698EEEC4}.Debug|Win32.Build.0 = Debug|Win32 - {1FD6B39B-FC9F-4219-AB56-4F7D698EEEC4}.Debug|x64.ActiveCfg = Debug|Win32 + {1FD6B39B-FC9F-4219-AB56-4F7D698EEEC4}.Debug|x64.ActiveCfg = Debug|x64 + {1FD6B39B-FC9F-4219-AB56-4F7D698EEEC4}.Debug|x64.Build.0 = Debug|x64 {1FD6B39B-FC9F-4219-AB56-4F7D698EEEC4}.Release|Win32.ActiveCfg = Release|Win32 {1FD6B39B-FC9F-4219-AB56-4F7D698EEEC4}.Release|Win32.Build.0 = Release|Win32 - {1FD6B39B-FC9F-4219-AB56-4F7D698EEEC4}.Release|x64.ActiveCfg = Release|Win32 + {1FD6B39B-FC9F-4219-AB56-4F7D698EEEC4}.Release|x64.ActiveCfg = Release|x64 + {1FD6B39B-FC9F-4219-AB56-4F7D698EEEC4}.Release|x64.Build.0 = Release|x64 {1C98109C-791B-4563-AA9C-D02963D2AEC1}.Debug|Win32.ActiveCfg = Debug|Win32 {1C98109C-791B-4563-AA9C-D02963D2AEC1}.Debug|Win32.Build.0 = Debug|Win32 - {1C98109C-791B-4563-AA9C-D02963D2AEC1}.Debug|x64.ActiveCfg = Debug|Win32 + {1C98109C-791B-4563-AA9C-D02963D2AEC1}.Debug|x64.ActiveCfg = Debug|x64 + {1C98109C-791B-4563-AA9C-D02963D2AEC1}.Debug|x64.Build.0 = Debug|x64 {1C98109C-791B-4563-AA9C-D02963D2AEC1}.Release|Win32.ActiveCfg = Release|Win32 {1C98109C-791B-4563-AA9C-D02963D2AEC1}.Release|Win32.Build.0 = Release|Win32 - {1C98109C-791B-4563-AA9C-D02963D2AEC1}.Release|x64.ActiveCfg = Release|Win32 + {1C98109C-791B-4563-AA9C-D02963D2AEC1}.Release|x64.ActiveCfg = Release|x64 + {1C98109C-791B-4563-AA9C-D02963D2AEC1}.Release|x64.Build.0 = Release|x64 {D62F2884-7E90-4A13-B41D-1BCFFCB6F6C6}.Debug|Win32.ActiveCfg = Debug|Win32 {D62F2884-7E90-4A13-B41D-1BCFFCB6F6C6}.Debug|Win32.Build.0 = Debug|Win32 - {D62F2884-7E90-4A13-B41D-1BCFFCB6F6C6}.Debug|x64.ActiveCfg = Debug|Win32 + {D62F2884-7E90-4A13-B41D-1BCFFCB6F6C6}.Debug|x64.ActiveCfg = Debug|x64 + {D62F2884-7E90-4A13-B41D-1BCFFCB6F6C6}.Debug|x64.Build.0 = Debug|x64 {D62F2884-7E90-4A13-B41D-1BCFFCB6F6C6}.Release|Win32.ActiveCfg = Release|Win32 {D62F2884-7E90-4A13-B41D-1BCFFCB6F6C6}.Release|Win32.Build.0 = Release|Win32 - {D62F2884-7E90-4A13-B41D-1BCFFCB6F6C6}.Release|x64.ActiveCfg = Release|Win32 + {D62F2884-7E90-4A13-B41D-1BCFFCB6F6C6}.Release|x64.ActiveCfg = Release|x64 + {D62F2884-7E90-4A13-B41D-1BCFFCB6F6C6}.Release|x64.Build.0 = Release|x64 {BD695BAF-A2E9-4E65-804A-CEBB4A45DF78}.Debug|Win32.ActiveCfg = Debug|Win32 {BD695BAF-A2E9-4E65-804A-CEBB4A45DF78}.Debug|Win32.Build.0 = Debug|Win32 - {BD695BAF-A2E9-4E65-804A-CEBB4A45DF78}.Debug|x64.ActiveCfg = Debug|Win32 + {BD695BAF-A2E9-4E65-804A-CEBB4A45DF78}.Debug|x64.ActiveCfg = Debug|x64 + {BD695BAF-A2E9-4E65-804A-CEBB4A45DF78}.Debug|x64.Build.0 = Debug|x64 {BD695BAF-A2E9-4E65-804A-CEBB4A45DF78}.Release|Win32.ActiveCfg = Release|Win32 {BD695BAF-A2E9-4E65-804A-CEBB4A45DF78}.Release|Win32.Build.0 = Release|Win32 - {BD695BAF-A2E9-4E65-804A-CEBB4A45DF78}.Release|x64.ActiveCfg = Release|Win32 + {BD695BAF-A2E9-4E65-804A-CEBB4A45DF78}.Release|x64.ActiveCfg = Release|x64 + {BD695BAF-A2E9-4E65-804A-CEBB4A45DF78}.Release|x64.Build.0 = Release|x64 {CCCE5F37-9749-4E83-A9F5-893855CD1850}.Debug|Win32.ActiveCfg = Debug|Win32 {CCCE5F37-9749-4E83-A9F5-893855CD1850}.Debug|Win32.Build.0 = Debug|Win32 - {CCCE5F37-9749-4E83-A9F5-893855CD1850}.Debug|x64.ActiveCfg = Debug|Win32 + {CCCE5F37-9749-4E83-A9F5-893855CD1850}.Debug|x64.ActiveCfg = Debug|x64 + {CCCE5F37-9749-4E83-A9F5-893855CD1850}.Debug|x64.Build.0 = Debug|x64 {CCCE5F37-9749-4E83-A9F5-893855CD1850}.Release|Win32.ActiveCfg = Release|Win32 {CCCE5F37-9749-4E83-A9F5-893855CD1850}.Release|Win32.Build.0 = Release|Win32 - {CCCE5F37-9749-4E83-A9F5-893855CD1850}.Release|x64.ActiveCfg = Release|Win32 + {CCCE5F37-9749-4E83-A9F5-893855CD1850}.Release|x64.ActiveCfg = Release|x64 + {CCCE5F37-9749-4E83-A9F5-893855CD1850}.Release|x64.Build.0 = Release|x64 {1151EE87-AB2E-4ABD-B0EB-EC5974A0BC9A}.Debug|Win32.ActiveCfg = Debug|Win32 {1151EE87-AB2E-4ABD-B0EB-EC5974A0BC9A}.Debug|Win32.Build.0 = Debug|Win32 - {1151EE87-AB2E-4ABD-B0EB-EC5974A0BC9A}.Debug|x64.ActiveCfg = Debug|Win32 + {1151EE87-AB2E-4ABD-B0EB-EC5974A0BC9A}.Debug|x64.ActiveCfg = Debug|x64 + {1151EE87-AB2E-4ABD-B0EB-EC5974A0BC9A}.Debug|x64.Build.0 = Debug|x64 {1151EE87-AB2E-4ABD-B0EB-EC5974A0BC9A}.Release|Win32.ActiveCfg = Release|Win32 {1151EE87-AB2E-4ABD-B0EB-EC5974A0BC9A}.Release|Win32.Build.0 = Release|Win32 - {1151EE87-AB2E-4ABD-B0EB-EC5974A0BC9A}.Release|x64.ActiveCfg = Release|Win32 + {1151EE87-AB2E-4ABD-B0EB-EC5974A0BC9A}.Release|x64.ActiveCfg = Release|x64 + {1151EE87-AB2E-4ABD-B0EB-EC5974A0BC9A}.Release|x64.Build.0 = Release|x64 {5AE2D199-E94E-4E65-A0F5-7242EE0227E9}.Debug|Win32.ActiveCfg = Debug|Win32 {5AE2D199-E94E-4E65-A0F5-7242EE0227E9}.Debug|Win32.Build.0 = Debug|Win32 - {5AE2D199-E94E-4E65-A0F5-7242EE0227E9}.Debug|x64.ActiveCfg = Debug|Win32 + {5AE2D199-E94E-4E65-A0F5-7242EE0227E9}.Debug|x64.ActiveCfg = Debug|x64 + {5AE2D199-E94E-4E65-A0F5-7242EE0227E9}.Debug|x64.Build.0 = Debug|x64 {5AE2D199-E94E-4E65-A0F5-7242EE0227E9}.Release|Win32.ActiveCfg = Release|Win32 {5AE2D199-E94E-4E65-A0F5-7242EE0227E9}.Release|Win32.Build.0 = Release|Win32 - {5AE2D199-E94E-4E65-A0F5-7242EE0227E9}.Release|x64.ActiveCfg = Release|Win32 + {5AE2D199-E94E-4E65-A0F5-7242EE0227E9}.Release|x64.ActiveCfg = Release|x64 + {5AE2D199-E94E-4E65-A0F5-7242EE0227E9}.Release|x64.Build.0 = Release|x64 {4427BC2F-CA34-48A6-8EC3-DF7CAC42F11E}.Debug|Win32.ActiveCfg = Debug|Win32 {4427BC2F-CA34-48A6-8EC3-DF7CAC42F11E}.Debug|Win32.Build.0 = Debug|Win32 - {4427BC2F-CA34-48A6-8EC3-DF7CAC42F11E}.Debug|x64.ActiveCfg = Debug|Win32 + {4427BC2F-CA34-48A6-8EC3-DF7CAC42F11E}.Debug|x64.ActiveCfg = Debug|x64 + {4427BC2F-CA34-48A6-8EC3-DF7CAC42F11E}.Debug|x64.Build.0 = Debug|x64 {4427BC2F-CA34-48A6-8EC3-DF7CAC42F11E}.Release|Win32.ActiveCfg = Release|Win32 {4427BC2F-CA34-48A6-8EC3-DF7CAC42F11E}.Release|Win32.Build.0 = Release|Win32 - {4427BC2F-CA34-48A6-8EC3-DF7CAC42F11E}.Release|x64.ActiveCfg = Release|Win32 + {4427BC2F-CA34-48A6-8EC3-DF7CAC42F11E}.Release|x64.ActiveCfg = Release|x64 + {4427BC2F-CA34-48A6-8EC3-DF7CAC42F11E}.Release|x64.Build.0 = Release|x64 {433314D0-A173-4041-8DB8-7641B7ED4D08}.Debug|Win32.ActiveCfg = Debug|Win32 {433314D0-A173-4041-8DB8-7641B7ED4D08}.Debug|Win32.Build.0 = Debug|Win32 - {433314D0-A173-4041-8DB8-7641B7ED4D08}.Debug|x64.ActiveCfg = Debug|Win32 + {433314D0-A173-4041-8DB8-7641B7ED4D08}.Debug|x64.ActiveCfg = Debug|x64 + {433314D0-A173-4041-8DB8-7641B7ED4D08}.Debug|x64.Build.0 = Debug|x64 {433314D0-A173-4041-8DB8-7641B7ED4D08}.Release|Win32.ActiveCfg = Release|Win32 {433314D0-A173-4041-8DB8-7641B7ED4D08}.Release|Win32.Build.0 = Release|Win32 - {433314D0-A173-4041-8DB8-7641B7ED4D08}.Release|x64.ActiveCfg = Release|Win32 + {433314D0-A173-4041-8DB8-7641B7ED4D08}.Release|x64.ActiveCfg = Release|x64 + {433314D0-A173-4041-8DB8-7641B7ED4D08}.Release|x64.Build.0 = Release|x64 {9A4119F5-6936-4C1A-8A40-EBDA0808348A}.Debug|Win32.ActiveCfg = Debug|Win32 {9A4119F5-6936-4C1A-8A40-EBDA0808348A}.Debug|Win32.Build.0 = Debug|Win32 - {9A4119F5-6936-4C1A-8A40-EBDA0808348A}.Debug|x64.ActiveCfg = Debug|Win32 + {9A4119F5-6936-4C1A-8A40-EBDA0808348A}.Debug|x64.ActiveCfg = Debug|x64 + {9A4119F5-6936-4C1A-8A40-EBDA0808348A}.Debug|x64.Build.0 = Debug|x64 {9A4119F5-6936-4C1A-8A40-EBDA0808348A}.Release|Win32.ActiveCfg = Release|Win32 {9A4119F5-6936-4C1A-8A40-EBDA0808348A}.Release|Win32.Build.0 = Release|Win32 - {9A4119F5-6936-4C1A-8A40-EBDA0808348A}.Release|x64.ActiveCfg = Release|Win32 + {9A4119F5-6936-4C1A-8A40-EBDA0808348A}.Release|x64.ActiveCfg = Release|x64 + {9A4119F5-6936-4C1A-8A40-EBDA0808348A}.Release|x64.Build.0 = Release|x64 {0A2BCE86-18E7-43DF-9BBF-F11EA7EB3469}.Debug|Win32.ActiveCfg = Debug|Win32 {0A2BCE86-18E7-43DF-9BBF-F11EA7EB3469}.Debug|Win32.Build.0 = Debug|Win32 - {0A2BCE86-18E7-43DF-9BBF-F11EA7EB3469}.Debug|x64.ActiveCfg = Debug|Win32 + {0A2BCE86-18E7-43DF-9BBF-F11EA7EB3469}.Debug|x64.ActiveCfg = Debug|x64 + {0A2BCE86-18E7-43DF-9BBF-F11EA7EB3469}.Debug|x64.Build.0 = Debug|x64 {0A2BCE86-18E7-43DF-9BBF-F11EA7EB3469}.Release|Win32.ActiveCfg = Release|Win32 {0A2BCE86-18E7-43DF-9BBF-F11EA7EB3469}.Release|Win32.Build.0 = Release|Win32 - {0A2BCE86-18E7-43DF-9BBF-F11EA7EB3469}.Release|x64.ActiveCfg = Release|Win32 + {0A2BCE86-18E7-43DF-9BBF-F11EA7EB3469}.Release|x64.ActiveCfg = Release|x64 + {0A2BCE86-18E7-43DF-9BBF-F11EA7EB3469}.Release|x64.Build.0 = Release|x64 {6CD92808-91D8-4A49-BCF9-6FADD43FBC83}.Debug|Win32.ActiveCfg = Debug|Win32 {6CD92808-91D8-4A49-BCF9-6FADD43FBC83}.Debug|Win32.Build.0 = Debug|Win32 - {6CD92808-91D8-4A49-BCF9-6FADD43FBC83}.Debug|x64.ActiveCfg = Debug|Win32 + {6CD92808-91D8-4A49-BCF9-6FADD43FBC83}.Debug|x64.ActiveCfg = Debug|x64 + {6CD92808-91D8-4A49-BCF9-6FADD43FBC83}.Debug|x64.Build.0 = Debug|x64 {6CD92808-91D8-4A49-BCF9-6FADD43FBC83}.Release|Win32.ActiveCfg = Release|Win32 {6CD92808-91D8-4A49-BCF9-6FADD43FBC83}.Release|Win32.Build.0 = Release|Win32 - {6CD92808-91D8-4A49-BCF9-6FADD43FBC83}.Release|x64.ActiveCfg = Release|Win32 + {6CD92808-91D8-4A49-BCF9-6FADD43FBC83}.Release|x64.ActiveCfg = Release|x64 + {6CD92808-91D8-4A49-BCF9-6FADD43FBC83}.Release|x64.Build.0 = Release|x64 {D09FA383-CE66-4640-B8A8-0EA789A8D34A}.Debug|Win32.ActiveCfg = Debug|Win32 {D09FA383-CE66-4640-B8A8-0EA789A8D34A}.Debug|Win32.Build.0 = Debug|Win32 - {D09FA383-CE66-4640-B8A8-0EA789A8D34A}.Debug|x64.ActiveCfg = Debug|Win32 + {D09FA383-CE66-4640-B8A8-0EA789A8D34A}.Debug|x64.ActiveCfg = Debug|x64 + {D09FA383-CE66-4640-B8A8-0EA789A8D34A}.Debug|x64.Build.0 = Debug|x64 {D09FA383-CE66-4640-B8A8-0EA789A8D34A}.Release|Win32.ActiveCfg = Release|Win32 {D09FA383-CE66-4640-B8A8-0EA789A8D34A}.Release|Win32.Build.0 = Release|Win32 - {D09FA383-CE66-4640-B8A8-0EA789A8D34A}.Release|x64.ActiveCfg = Release|Win32 + {D09FA383-CE66-4640-B8A8-0EA789A8D34A}.Release|x64.ActiveCfg = Release|x64 + {D09FA383-CE66-4640-B8A8-0EA789A8D34A}.Release|x64.Build.0 = Release|x64 {D1B7F820-4A7A-47CB-BDB2-62E8B8C29F61}.Debug|Win32.ActiveCfg = Debug|Win32 {D1B7F820-4A7A-47CB-BDB2-62E8B8C29F61}.Debug|Win32.Build.0 = Debug|Win32 - {D1B7F820-4A7A-47CB-BDB2-62E8B8C29F61}.Debug|x64.ActiveCfg = Debug|Win32 + {D1B7F820-4A7A-47CB-BDB2-62E8B8C29F61}.Debug|x64.ActiveCfg = Debug|x64 + {D1B7F820-4A7A-47CB-BDB2-62E8B8C29F61}.Debug|x64.Build.0 = Debug|x64 {D1B7F820-4A7A-47CB-BDB2-62E8B8C29F61}.Release|Win32.ActiveCfg = Release|Win32 {D1B7F820-4A7A-47CB-BDB2-62E8B8C29F61}.Release|Win32.Build.0 = Release|Win32 - {D1B7F820-4A7A-47CB-BDB2-62E8B8C29F61}.Release|x64.ActiveCfg = Release|Win32 + {D1B7F820-4A7A-47CB-BDB2-62E8B8C29F61}.Release|x64.ActiveCfg = Release|x64 + {D1B7F820-4A7A-47CB-BDB2-62E8B8C29F61}.Release|x64.Build.0 = Release|x64 {0046609E-6A36-4A27-B328-D2291BF4A163}.Debug|Win32.ActiveCfg = Debug|Win32 {0046609E-6A36-4A27-B328-D2291BF4A163}.Debug|Win32.Build.0 = Debug|Win32 - {0046609E-6A36-4A27-B328-D2291BF4A163}.Debug|x64.ActiveCfg = Debug|Win32 + {0046609E-6A36-4A27-B328-D2291BF4A163}.Debug|x64.ActiveCfg = Debug|x64 + {0046609E-6A36-4A27-B328-D2291BF4A163}.Debug|x64.Build.0 = Debug|x64 {0046609E-6A36-4A27-B328-D2291BF4A163}.Release|Win32.ActiveCfg = Release|Win32 {0046609E-6A36-4A27-B328-D2291BF4A163}.Release|Win32.Build.0 = Release|Win32 - {0046609E-6A36-4A27-B328-D2291BF4A163}.Release|x64.ActiveCfg = Release|Win32 + {0046609E-6A36-4A27-B328-D2291BF4A163}.Release|x64.ActiveCfg = Release|x64 + {0046609E-6A36-4A27-B328-D2291BF4A163}.Release|x64.Build.0 = Release|x64 {91D2B2E0-D1EC-45B5-AEF4-52D1273652FD}.Debug|Win32.ActiveCfg = Debug|Win32 {91D2B2E0-D1EC-45B5-AEF4-52D1273652FD}.Debug|Win32.Build.0 = Debug|Win32 - {91D2B2E0-D1EC-45B5-AEF4-52D1273652FD}.Debug|x64.ActiveCfg = Debug|Win32 + {91D2B2E0-D1EC-45B5-AEF4-52D1273652FD}.Debug|x64.ActiveCfg = Debug|x64 + {91D2B2E0-D1EC-45B5-AEF4-52D1273652FD}.Debug|x64.Build.0 = Debug|x64 {91D2B2E0-D1EC-45B5-AEF4-52D1273652FD}.Release|Win32.ActiveCfg = Release|Win32 {91D2B2E0-D1EC-45B5-AEF4-52D1273652FD}.Release|Win32.Build.0 = Release|Win32 - {91D2B2E0-D1EC-45B5-AEF4-52D1273652FD}.Release|x64.ActiveCfg = Release|Win32 + {91D2B2E0-D1EC-45B5-AEF4-52D1273652FD}.Release|x64.ActiveCfg = Release|x64 + {91D2B2E0-D1EC-45B5-AEF4-52D1273652FD}.Release|x64.Build.0 = Release|x64 {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Win32.ActiveCfg = Debug|Win32 {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Win32.Build.0 = Debug|Win32 - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|x64.ActiveCfg = Debug|Win32 + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|x64.ActiveCfg = Debug|x64 + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|x64.Build.0 = Debug|x64 {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Win32.ActiveCfg = Release|Win32 {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Win32.Build.0 = Release|Win32 - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|x64.ActiveCfg = Release|Win32 + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|x64.ActiveCfg = Release|x64 + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|x64.Build.0 = Release|x64 {73EF2265-3791-4C67-89A0-9DA47D663144}.Debug|Win32.ActiveCfg = Debug|Win32 {73EF2265-3791-4C67-89A0-9DA47D663144}.Debug|Win32.Build.0 = Debug|Win32 - {73EF2265-3791-4C67-89A0-9DA47D663144}.Debug|x64.ActiveCfg = Debug|Win32 + {73EF2265-3791-4C67-89A0-9DA47D663144}.Debug|x64.ActiveCfg = Debug|x64 + {73EF2265-3791-4C67-89A0-9DA47D663144}.Debug|x64.Build.0 = Debug|x64 {73EF2265-3791-4C67-89A0-9DA47D663144}.Release|Win32.ActiveCfg = Release|Win32 {73EF2265-3791-4C67-89A0-9DA47D663144}.Release|Win32.Build.0 = Release|Win32 - {73EF2265-3791-4C67-89A0-9DA47D663144}.Release|x64.ActiveCfg = Release|Win32 + {73EF2265-3791-4C67-89A0-9DA47D663144}.Release|x64.ActiveCfg = Release|x64 + {73EF2265-3791-4C67-89A0-9DA47D663144}.Release|x64.Build.0 = Release|x64 {7347CF0C-0A9B-4987-A811-98E7B8008B0D}.Debug|Win32.ActiveCfg = Debug|Win32 {7347CF0C-0A9B-4987-A811-98E7B8008B0D}.Debug|Win32.Build.0 = Debug|Win32 - {7347CF0C-0A9B-4987-A811-98E7B8008B0D}.Debug|x64.ActiveCfg = Debug|Win32 + {7347CF0C-0A9B-4987-A811-98E7B8008B0D}.Debug|x64.ActiveCfg = Debug|x64 + {7347CF0C-0A9B-4987-A811-98E7B8008B0D}.Debug|x64.Build.0 = Debug|x64 {7347CF0C-0A9B-4987-A811-98E7B8008B0D}.Release|Win32.ActiveCfg = Release|Win32 {7347CF0C-0A9B-4987-A811-98E7B8008B0D}.Release|Win32.Build.0 = Release|Win32 - {7347CF0C-0A9B-4987-A811-98E7B8008B0D}.Release|x64.ActiveCfg = Release|Win32 + {7347CF0C-0A9B-4987-A811-98E7B8008B0D}.Release|x64.ActiveCfg = Release|x64 + {7347CF0C-0A9B-4987-A811-98E7B8008B0D}.Release|x64.Build.0 = Release|x64 {FE06FF4C-6772-48C7-9FFB-BCA00CBA8DA1}.Debug|Win32.ActiveCfg = Debug|Win32 {FE06FF4C-6772-48C7-9FFB-BCA00CBA8DA1}.Debug|Win32.Build.0 = Debug|Win32 - {FE06FF4C-6772-48C7-9FFB-BCA00CBA8DA1}.Debug|x64.ActiveCfg = Debug|Win32 + {FE06FF4C-6772-48C7-9FFB-BCA00CBA8DA1}.Debug|x64.ActiveCfg = Debug|x64 + {FE06FF4C-6772-48C7-9FFB-BCA00CBA8DA1}.Debug|x64.Build.0 = Debug|x64 {FE06FF4C-6772-48C7-9FFB-BCA00CBA8DA1}.Release|Win32.ActiveCfg = Release|Win32 {FE06FF4C-6772-48C7-9FFB-BCA00CBA8DA1}.Release|Win32.Build.0 = Release|Win32 - {FE06FF4C-6772-48C7-9FFB-BCA00CBA8DA1}.Release|x64.ActiveCfg = Release|Win32 + {FE06FF4C-6772-48C7-9FFB-BCA00CBA8DA1}.Release|x64.ActiveCfg = Release|x64 + {FE06FF4C-6772-48C7-9FFB-BCA00CBA8DA1}.Release|x64.Build.0 = Release|x64 {68F2AA4E-3774-4A03-947D-9890DF0E73C5}.Debug|Win32.ActiveCfg = Debug|Win32 {68F2AA4E-3774-4A03-947D-9890DF0E73C5}.Debug|Win32.Build.0 = Debug|Win32 - {68F2AA4E-3774-4A03-947D-9890DF0E73C5}.Debug|x64.ActiveCfg = Debug|Win32 + {68F2AA4E-3774-4A03-947D-9890DF0E73C5}.Debug|x64.ActiveCfg = Debug|x64 + {68F2AA4E-3774-4A03-947D-9890DF0E73C5}.Debug|x64.Build.0 = Debug|x64 {68F2AA4E-3774-4A03-947D-9890DF0E73C5}.Release|Win32.ActiveCfg = Release|Win32 {68F2AA4E-3774-4A03-947D-9890DF0E73C5}.Release|Win32.Build.0 = Release|Win32 - {68F2AA4E-3774-4A03-947D-9890DF0E73C5}.Release|x64.ActiveCfg = Release|Win32 + {68F2AA4E-3774-4A03-947D-9890DF0E73C5}.Release|x64.ActiveCfg = Release|x64 + {68F2AA4E-3774-4A03-947D-9890DF0E73C5}.Release|x64.Build.0 = Release|x64 {3F97A697-44DB-4A22-A5F3-7168A990B3C0}.Debug|Win32.ActiveCfg = Debug|Win32 {3F97A697-44DB-4A22-A5F3-7168A990B3C0}.Debug|Win32.Build.0 = Debug|Win32 - {3F97A697-44DB-4A22-A5F3-7168A990B3C0}.Debug|x64.ActiveCfg = Debug|Win32 + {3F97A697-44DB-4A22-A5F3-7168A990B3C0}.Debug|x64.ActiveCfg = Debug|x64 + {3F97A697-44DB-4A22-A5F3-7168A990B3C0}.Debug|x64.Build.0 = Debug|x64 {3F97A697-44DB-4A22-A5F3-7168A990B3C0}.Release|Win32.ActiveCfg = Release|Win32 {3F97A697-44DB-4A22-A5F3-7168A990B3C0}.Release|Win32.Build.0 = Release|Win32 - {3F97A697-44DB-4A22-A5F3-7168A990B3C0}.Release|x64.ActiveCfg = Release|Win32 + {3F97A697-44DB-4A22-A5F3-7168A990B3C0}.Release|x64.ActiveCfg = Release|x64 + {3F97A697-44DB-4A22-A5F3-7168A990B3C0}.Release|x64.Build.0 = Release|x64 {E38D5A31-C96D-437E-A495-4314EF198CEB}.Debug|Win32.ActiveCfg = Debug|Win32 {E38D5A31-C96D-437E-A495-4314EF198CEB}.Debug|Win32.Build.0 = Debug|Win32 - {E38D5A31-C96D-437E-A495-4314EF198CEB}.Debug|x64.ActiveCfg = Debug|Win32 + {E38D5A31-C96D-437E-A495-4314EF198CEB}.Debug|x64.ActiveCfg = Debug|x64 + {E38D5A31-C96D-437E-A495-4314EF198CEB}.Debug|x64.Build.0 = Debug|x64 {E38D5A31-C96D-437E-A495-4314EF198CEB}.Release|Win32.ActiveCfg = Release|Win32 {E38D5A31-C96D-437E-A495-4314EF198CEB}.Release|Win32.Build.0 = Release|Win32 - {E38D5A31-C96D-437E-A495-4314EF198CEB}.Release|x64.ActiveCfg = Release|Win32 + {E38D5A31-C96D-437E-A495-4314EF198CEB}.Release|x64.ActiveCfg = Release|x64 + {E38D5A31-C96D-437E-A495-4314EF198CEB}.Release|x64.Build.0 = Release|x64 {A3B0AACD-C28C-4E02-9385-901383E91AF5}.Debug|Win32.ActiveCfg = Debug|Win32 {A3B0AACD-C28C-4E02-9385-901383E91AF5}.Debug|Win32.Build.0 = Debug|Win32 - {A3B0AACD-C28C-4E02-9385-901383E91AF5}.Debug|x64.ActiveCfg = Debug|Win32 + {A3B0AACD-C28C-4E02-9385-901383E91AF5}.Debug|x64.ActiveCfg = Debug|x64 + {A3B0AACD-C28C-4E02-9385-901383E91AF5}.Debug|x64.Build.0 = Debug|x64 {A3B0AACD-C28C-4E02-9385-901383E91AF5}.Release|Win32.ActiveCfg = Release|Win32 {A3B0AACD-C28C-4E02-9385-901383E91AF5}.Release|Win32.Build.0 = Release|Win32 - {A3B0AACD-C28C-4E02-9385-901383E91AF5}.Release|x64.ActiveCfg = Release|Win32 + {A3B0AACD-C28C-4E02-9385-901383E91AF5}.Release|x64.ActiveCfg = Release|x64 + {A3B0AACD-C28C-4E02-9385-901383E91AF5}.Release|x64.Build.0 = Release|x64 {1DE45393-14EC-4D29-A2F8-61FC60C2C286}.Debug|Win32.ActiveCfg = Debug|Win32 {1DE45393-14EC-4D29-A2F8-61FC60C2C286}.Debug|Win32.Build.0 = Debug|Win32 - {1DE45393-14EC-4D29-A2F8-61FC60C2C286}.Debug|x64.ActiveCfg = Debug|Win32 + {1DE45393-14EC-4D29-A2F8-61FC60C2C286}.Debug|x64.ActiveCfg = Debug|x64 + {1DE45393-14EC-4D29-A2F8-61FC60C2C286}.Debug|x64.Build.0 = Debug|x64 {1DE45393-14EC-4D29-A2F8-61FC60C2C286}.Release|Win32.ActiveCfg = Release|Win32 {1DE45393-14EC-4D29-A2F8-61FC60C2C286}.Release|Win32.Build.0 = Release|Win32 - {1DE45393-14EC-4D29-A2F8-61FC60C2C286}.Release|x64.ActiveCfg = Release|Win32 + {1DE45393-14EC-4D29-A2F8-61FC60C2C286}.Release|x64.ActiveCfg = Release|x64 + {1DE45393-14EC-4D29-A2F8-61FC60C2C286}.Release|x64.Build.0 = Release|x64 {16DA84DA-79DC-4631-B5A6-4D31433433AD}.Debug|Win32.ActiveCfg = Debug|Win32 {16DA84DA-79DC-4631-B5A6-4D31433433AD}.Debug|Win32.Build.0 = Debug|Win32 - {16DA84DA-79DC-4631-B5A6-4D31433433AD}.Debug|x64.ActiveCfg = Debug|Win32 + {16DA84DA-79DC-4631-B5A6-4D31433433AD}.Debug|x64.ActiveCfg = Debug|x64 + {16DA84DA-79DC-4631-B5A6-4D31433433AD}.Debug|x64.Build.0 = Debug|x64 {16DA84DA-79DC-4631-B5A6-4D31433433AD}.Release|Win32.ActiveCfg = Release|Win32 {16DA84DA-79DC-4631-B5A6-4D31433433AD}.Release|Win32.Build.0 = Release|Win32 - {16DA84DA-79DC-4631-B5A6-4D31433433AD}.Release|x64.ActiveCfg = Release|Win32 + {16DA84DA-79DC-4631-B5A6-4D31433433AD}.Release|x64.ActiveCfg = Release|x64 + {16DA84DA-79DC-4631-B5A6-4D31433433AD}.Release|x64.Build.0 = Release|x64 {828862FD-26AA-46FB-9F5B-92C6F522FE4F}.Debug|Win32.ActiveCfg = Debug|Win32 {828862FD-26AA-46FB-9F5B-92C6F522FE4F}.Debug|Win32.Build.0 = Debug|Win32 {828862FD-26AA-46FB-9F5B-92C6F522FE4F}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp index ac756e6a04..e757090085 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp @@ -32,7 +32,7 @@ #include #include "resource.h" #include -#include "vesim.h" +#include // ============================================================== // Some global parameters @@ -89,9 +89,9 @@ class ProjectApolloConfigurator: public LaunchpadItem { char *Description() { return "Global configuration for Project Apollo - NASSP."; } bool clbkOpen (HWND hLaunchpad); int clbkWriteConfig (); - static BOOL CALLBACK DlgProcFrame (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - static BOOL CALLBACK DlgProcVisual (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - static BOOL CALLBACK DlgProcControl (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + static INT_PTR CALLBACK DlgProcFrame (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + static INT_PTR CALLBACK DlgProcVisual (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + static INT_PTR CALLBACK DlgProcControl (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); protected: void WriteConfig(FILEHANDLE hFile); @@ -227,7 +227,7 @@ void ProjectApolloConfigurator::WriteConfig(FILEHANDLE hFile) oapiCloseFile (hFile, FILE_OUT); } -BOOL CALLBACK ProjectApolloConfigurator::DlgProcFrame (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK ProjectApolloConfigurator::DlgProcFrame (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { TCITEM tabitem; HWND hTab; @@ -432,7 +432,7 @@ BOOL CALLBACK ProjectApolloConfigurator::DlgProcFrame (HWND hWnd, UINT uMsg, WPA return 0; } -BOOL CALLBACK ProjectApolloConfigurator::DlgProcVisual (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK ProjectApolloConfigurator::DlgProcVisual (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { case WM_INITDIALOG: // display the current value @@ -453,7 +453,7 @@ BOOL CALLBACK ProjectApolloConfigurator::DlgProcVisual (HWND hWnd, UINT uMsg, WP return 0; } -BOOL CALLBACK ProjectApolloConfigurator::DlgProcControl (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK ProjectApolloConfigurator::DlgProcControl (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { char buffer[100]; @@ -545,22 +545,24 @@ BOOL CALLBACK ProjectApolloConfigurator::DlgProcControl (HWND hWnd, UINT uMsg, W UpdateControlState(hWnd); } else if (HIWORD(wParam) == BN_CLICKED && (HWND)lParam == GetDlgItem(hWnd, IDC_BUTTON_CREATECONFIG)) { + /* std::string configdir = "Config\\ProjectApollo\\Vesim\\"; LPDIRECTINPUT8 dx8ppv; - HRESULT hr = DirectInput8Create((HINSTANCE) GetWindowLong(hWnd, GWL_HINSTANCE), DIRECTINPUT_VERSION, IID_IDirectInput8, (void **)&dx8ppv, NULL); // Give us a DirectInput context + HRESULT hr = DirectInput8Create((HINSTANCE) GetWindowLong(hWnd, GWLP_HINSTANCE), DIRECTINPUT_VERSION, IID_IDirectInput8, (void **)&dx8ppv, NULL); // Give us a DirectInput context if (!FAILED(hr)) { Vesim lmvm(NULL, NULL), csmvm(NULL, NULL); lmvm.setupDevices("LM", dx8ppv); csmvm.setupDevices("CSM", dx8ppv); lmvm.createUserConfigs(); csmvm.createUserConfigs(); - /*if (enableVESIM) { - for (int i = 0; i < LM_AXIS_INPUT_CNT; i++) - vesim.addInput(&vesim_lm_inputs[i]); - - }*/ + //if (enableVESIM) { + // for (int i = 0; i < LM_AXIS_INPUT_CNT; i++) + // vesim.addInput(&vesim_lm_inputs[i]); + // + //} dx8ppv->Release(); } + */ } break; diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/vesim.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/vesim.cpp deleted file mode 100644 index d1ea82b8b7..0000000000 --- a/Orbitersdk/samples/ProjectApollo/src_aux/vesim.cpp +++ /dev/null @@ -1,725 +0,0 @@ -/*************************************************************************** -This file is part of Project Apollo - NASSP -Copyright 2020 - -Vessel Specific Input Manager - -Project Apollo is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -Project Apollo is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Project Apollo; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -See http://nassp.sourceforge.net/license/ for more details. - -**************************** Revision History ****************************/ - -#define SECURE - -#include -#include -#include "Orbitersdk.h" - -#define DIRECTINPUT_VERSION 0x0800 -#include "dinput.h" - -#include "vesim.h" - -#define VESIM_DEVICETYPE_KEYBOARD 1 -#define VESIM_DEVICETYPE_JOYSTICK 2 - -#define VESIM_SUBDEVTYPE_AXIS 1 -#define VESIM_SUBDEVTYPE_BUTTON 2 -#define VESIM_SUBDEVTYPE_KEY 3 - -#define VESIM_DEVICE_AXIS_X 1 -#define VESIM_DEVICE_AXIS_Y 2 -#define VESIM_DEVICE_AXIS_Z 3 -#define VESIM_DEVICE_AXIS_RX 4 -#define VESIM_DEVICE_AXIS_RY 5 -#define VESIM_DEVICE_AXIS_RZ 6 -#define VESIM_DEVICE_SLDR0 7 -#define VESIM_DEVICE_SLDR1 8 -#define VESIM_DEVICE_POV 16 - - - -#define VESIM_CFG_EXT ".cfg" -#define VESIM_CFG_USER_EXT ".launchpad.cfg" -#define VESIM_CFG_GENERIC "GenericJoystick" - -char *subdevnames[] = { - "X", "Y", "Z", "RX", "RY", "RZ" -}; - -char *povaxnames[] = { - "0H", "0V", "1H", "1V", "2H", "2V", "3H", "3V" -}; - -struct KeyData{ - int oapiID; - char *keyName; -}; - -#define KEYDATA_CNT 102 -KeyData keydata[KEYDATA_CNT] = { - { OAPI_KEY_ESCAPE, "Escape" }, - { OAPI_KEY_1, "1" }, - { OAPI_KEY_2, "2" }, - { OAPI_KEY_3, "3" }, - { OAPI_KEY_4, "4" }, - { OAPI_KEY_5, "5" }, - { OAPI_KEY_6, "6" }, - { OAPI_KEY_7, "7" }, - { OAPI_KEY_8, "8" }, - { OAPI_KEY_9, "9" }, - { OAPI_KEY_0, "0" }, - { OAPI_KEY_MINUS, "-" }, - { OAPI_KEY_EQUALS, "=" }, - { OAPI_KEY_BACK, "Backspace" }, - { OAPI_KEY_TAB, "Tab" }, - { OAPI_KEY_Q, "Q" }, - { OAPI_KEY_W, "W" }, - { OAPI_KEY_E, "E" }, - { OAPI_KEY_R, "R" }, - { OAPI_KEY_T, "T" }, - { OAPI_KEY_Y, "Y" }, - { OAPI_KEY_U, "U" }, - { OAPI_KEY_I, "I" }, - { OAPI_KEY_O, "O" }, - { OAPI_KEY_P, "P" }, - { OAPI_KEY_LBRACKET, "{" }, - { OAPI_KEY_RBRACKET, "}" }, - { OAPI_KEY_RETURN, "Enter" }, - { OAPI_KEY_LCONTROL, "LCtrl" }, - { OAPI_KEY_A, "A" }, - { OAPI_KEY_S, "S" }, - { OAPI_KEY_D, "D" }, - { OAPI_KEY_F, "F" }, - { OAPI_KEY_G, "G" }, - { OAPI_KEY_H, "H" }, - { OAPI_KEY_J, "J" }, - { OAPI_KEY_K, "K" }, - { OAPI_KEY_L, "L" }, - { OAPI_KEY_SEMICOLON, ";" }, - { OAPI_KEY_APOSTROPHE, "'" }, - { OAPI_KEY_GRAVE, "`" }, - { OAPI_KEY_LSHIFT, "LShift" }, - { OAPI_KEY_BACKSLASH, "\\" }, - { OAPI_KEY_Z, "Z" }, - { OAPI_KEY_X, "X" }, - { OAPI_KEY_C, "C" }, - { OAPI_KEY_V, "V" }, - { OAPI_KEY_B, "B" }, - { OAPI_KEY_N, "N" }, - { OAPI_KEY_M, "M" }, - { OAPI_KEY_COMMA, "," }, - { OAPI_KEY_PERIOD, "." }, - { OAPI_KEY_SLASH, "/" }, - { OAPI_KEY_RSHIFT, "RShift" }, - { OAPI_KEY_MULTIPLY, "Keypad *" }, - { OAPI_KEY_LALT, "LAlt" }, - { OAPI_KEY_SPACE, "Space" }, - { OAPI_KEY_CAPITAL, "Caps Lock" }, - { OAPI_KEY_F1, "F1" }, - { OAPI_KEY_F2, "F2" }, - { OAPI_KEY_F3, "F3" }, - { OAPI_KEY_F4, "F4" }, - { OAPI_KEY_F5, "F5" }, - { OAPI_KEY_F6, "F6" }, - { OAPI_KEY_F7, "F7" }, - { OAPI_KEY_F8, "F8" }, - { OAPI_KEY_F9, "F9" }, - { OAPI_KEY_F10, "F10" }, - { OAPI_KEY_NUMLOCK, "Num Lock" }, - { OAPI_KEY_SCROLL, "Scroll Lock" }, - { OAPI_KEY_NUMPAD7, "Keypad 7" }, - { OAPI_KEY_NUMPAD8, "Keypad 8" }, - { OAPI_KEY_NUMPAD9, "Keypad 9" }, - { OAPI_KEY_SUBTRACT, "Keypad -" }, - { OAPI_KEY_NUMPAD4, "Keypad 4" }, - { OAPI_KEY_NUMPAD5, "Keypad 5" }, - { OAPI_KEY_NUMPAD6, "Keypad 6" }, - { OAPI_KEY_ADD, "Keypad +" }, - { OAPI_KEY_NUMPAD1, "Keypad 1" }, - { OAPI_KEY_NUMPAD2, "Keypad 2" }, - { OAPI_KEY_NUMPAD3, "Keypad 3" }, - { OAPI_KEY_NUMPAD0, "Keypad 0" }, - { OAPI_KEY_DECIMAL, "Keypad ." }, - { OAPI_KEY_OEM_102, "OEM 102" }, - { OAPI_KEY_F11, "F11" }, - { OAPI_KEY_F12, "F12" }, - { OAPI_KEY_NUMPADENTER, "Keypad Enter" }, - { OAPI_KEY_RCONTROL, "RCtrl" }, - { OAPI_KEY_DIVIDE, "Keypad /" }, - { OAPI_KEY_SYSRQ, "SysReq" }, - { OAPI_KEY_RALT, "RAlt" }, - { OAPI_KEY_PAUSE, "Pause" }, - { OAPI_KEY_HOME, "Home" }, - { OAPI_KEY_UP, "Up" }, - { OAPI_KEY_PRIOR, "Page Up" }, - { OAPI_KEY_LEFT, "Left" }, - { OAPI_KEY_RIGHT, "Right" }, - { OAPI_KEY_END, "End" }, - { OAPI_KEY_DOWN, "Down" }, - { OAPI_KEY_NEXT, "Page Down" }, - { OAPI_KEY_INSERT, "Insert" }, - { OAPI_KEY_DELETE, "Delete" } -}; - -bool icomp(const char *s1, const char *s2) { - //printf("icomp(\"%s\", \"%s\"\n", s1, s2); - while (*s1 == ' ' && *s1 != 0) s1++; - while (*s2 == ' ' && *s2 != 0) s2++; - //printf("After trim c1: %c %hhx c2: %c %hhx\n", *s1, *s1, *s2, *s2); - - while (*s1 != 0 && *s2 != 0) { - char c1 = *s1; - char c2 = *s2; - if (c1 >= 'A' && c1 <= 'Z') { - c1 = c1 - 'A' + 'a'; - } - if (c2 >= 'A' && c2 <= 'Z') { - c2 = c2 - 'A' + 'a'; - } - if (c1 != c2) return false; - s1++; - s2++; - //printf("c1: %c %hhx c2: %c %hhx\n", c1, c1, c2, c2); - } - - while (*s1 == ' ' && *s1 != 0) s1++; - while (*s2 == ' ' && *s2 != 0) s2++; - //printf("Trail trim c1: %c %hhx c2: %c %hhx\n", *s1, *s1, *s2, *s2); - if (*s1 != *s2) return false; - return true; -} - -int VesimInput::addConnection(int deviceID, int subdeviceType, int subdeviceID, int modifiers, bool reverse){ - if (nconns >= VESIM_MAX_INPUT_CONNS) return -1; - conn[nconns].deviceID = deviceID; - conn[nconns].subdeviceID = subdeviceID; - conn[nconns].subdeviceType = subdeviceType; - conn[nconns].modifiers = modifiers; - conn[nconns].reverse = reverse; - conn[nconns].value = 0; - return nconns++; -} - -VesimDevice::VesimDevice(Vesim *parent) : parent(parent), name("Keyboard") { - type = VESIM_DEVICETYPE_KEYBOARD; -}; - -VesimDevice::VesimDevice(Vesim *parent, const char* deviceName, LPDIRECTINPUTDEVICE8 dx8_joystick) : - parent(parent), name(deviceName), dx8_joystick(dx8_joystick) { - type = VESIM_DEVICETYPE_JOYSTICK; - dx8_joystick->SetDataFormat(&c_dfDIJoystick2); -}; - -void VesimDevice::poolDevice() { - if (type == VESIM_DEVICETYPE_JOYSTICK) { - HRESULT hr = dx8_joystick->Poll(); - if (FAILED(hr)) { // Did that work? - // Attempt to acquire the device - hr = dx8_joystick->Acquire(); - if (FAILED(hr)) { -#ifdef _DEBUG - fprintf(parent->out_file, "DX8JS: Cannot aquire %s\n", name.c_str()); -#endif - } - else { - hr = dx8_joystick->Poll(); - } - } - // Read data - dx8_joystick->GetDeviceState(sizeof(dx8_jstate), &dx8_jstate); - } -} - -VesimDevice::~VesimDevice() { - -} - -Vesim::Vesim(CbInputChanged cbInputChanged, void *pCbData) : cbInputChanged(cbInputChanged), pCbData(pCbData) { - int i; - for (i = 0; i < VESIM_MAX_INPUTS; i++) - inpid2idx[i] = -1; - for (i = 0; i < 256; i++) { - key2conn[i][0] = -1; - key2conn[i][1] = -1; - } - vdev.emplace_back(this); -#ifdef _DEBUG - out_file = fopen("vesim.log", "wt"); - fprintf(out_file, "Vesim object created\n"); -#endif -} - -Vesim::~Vesim() { - int ndev = vdev.size(); - for (int i = 0; i < ndev; i++) { - VesimDevice *d = &vdev[i]; - if (d->type == VESIM_DEVICETYPE_JOYSTICK) { - d->dx8_joystick->Unacquire(); - d->dx8_joystick->Release(); - } - } -#ifdef _DEBUG - fclose(out_file); -#endif -} - -BOOL CALLBACK VesimEnumJoysticksCB(const DIDEVICEINSTANCE* pdidInstance, VOID* pVesim) -{ - class Vesim* ves = (Vesim*)pVesim; // Pointer to us - HRESULT hr; - LPDIRECTINPUTDEVICE8 dx8_joystick; - -#ifdef _DEBUG - fprintf(ves->out_file, "Found stick instance: %s Prod name: %s\n", &pdidInstance->tszInstanceName[0], &pdidInstance->tszProductName[0]); - fflush(ves->out_file); -#endif - // Obtain an interface to the enumerated joystick. - hr = ves->dx8ppv->CreateDevice(pdidInstance->guidInstance, &dx8_joystick, NULL); - - if (FAILED(hr)) { // Did that work? - return DIENUM_CONTINUE; - } // No, keep enumerating (if there's more) - - ves->vdev.emplace_back(ves, &pdidInstance->tszProductName[0], dx8_joystick); - - return DIENUM_CONTINUE; // and keep enumerating -} - -std::string getDeviceInputFileName(char* vesselStationName, std::string deviceName, bool isUserCfg) { - std::string ret("Config\\ProjectApollo\\Vesim\\"); - ret.append(vesselStationName); - ret.append(" - "); - ret.append(deviceName); - ret.append(isUserCfg ? VESIM_CFG_USER_EXT : VESIM_CFG_EXT); - return ret; -} - -bool Vesim::setupDevices(char* vesselStationName, LPDIRECTINPUT8 dx8ppv){ -#ifdef _DEBUG - fprintf(out_file, "Setting up controller devices for vessel %s\n", vesselStationName); - fflush(out_file); -#endif - this->vesselStationName = vesselStationName; - this->dx8ppv = dx8ppv; - dx8ppv->EnumDevices(DI8DEVCLASS_GAMECTRL, VesimEnumJoysticksCB, this, DIEDFL_ATTACHEDONLY); - int ndev = vdev.size(); - for (int devid = 0; devid < ndev; devid++) { - std::string devicename = vdev[devid].name; -#ifdef _DEBUG - fprintf(out_file, "Setting up device %s\n", devicename.c_str()); -#endif - int devtype = vdev[devid].type; - - // Fallback config files - // - // User prefered settings should use extension ".launchpad.cfg". Files with plain "cfg" extension - // (without ".launchpad." are not to be changed by users but these could be used as templates - // for user settings. cfgnames[1] and cfgnames[2] are temporary fallbacks till the user-friendly - // configurator will not be ready. The rationale is to avoid difficulties with joystick names when - // manually creating user config files. Now it is enough to duplicate a vessel-specific generic - // joystick configuration file with extension ".launchpad.cfg" and edit it. - - std::string cfgfnames[5]; - cfgfnames[0] = getDeviceInputFileName(vesselStationName, devicename, true); - cfgfnames[1] = getDeviceInputFileName(vesselStationName, VESIM_CFG_GENERIC, true); - cfgfnames[2] = std::string(VESIM_CFG_GENERIC)+VESIM_CFG_USER_EXT; - cfgfnames[3] = getDeviceInputFileName(vesselStationName, devicename, false); - cfgfnames[4] = getDeviceInputFileName(vesselStationName, VESIM_CFG_GENERIC, false); - - std::ifstream fdevcfg; - for (int k = 0; k < 5; k++) { - fdevcfg = std::ifstream(cfgfnames[k]); -#ifdef _DEBUG - fprintf(out_file, "Attempting to open file %s\n", cfgfnames[k].c_str()); -#endif - if (fdevcfg.is_open()) break; - } - if (!fdevcfg.is_open()) break; - -#ifdef _DEBUG - fflush(out_file); -#endif - std::string line; - int lineidx = 0; - int colidx[] = { -1, -1, -1, -1, -1, -1, -1 }; - while (std::getline(fdevcfg, line)) - { -#ifdef _DEBUG - fprintf(out_file, "Cfg Line:%s \n", line.c_str()); -#endif - int posidx = 0; - std::istringstream ts (line); - std::string token; - std::string inpname; - int inptype = -1; - int subdevtype = -1; - int subdevid = -1; - bool isreverse = false; - while (posidx<7 && std::getline(ts, token, '\t')) { - if (lineidx == 0) { - if (token == "INPUT") - colidx[posidx] = 0; - else if (token == "INPUTTYPE") - colidx[posidx] = 1; - else if (token == "SUBDEVID") - colidx[posidx] = 2; - else if (token == "REVERSE") - colidx[posidx] = 3; - else if (token == "MODIFIER") - colidx[posidx] = 4; - } - else { - const char *ptok = token.c_str(); - switch (colidx[posidx]) { - case 0: - inpname = token; - break; - case 1: - if (icomp(ptok, "Axis")) inptype = VESIM_INPUTTYPE_AXIS; - else if (icomp(ptok, "Button")) inptype = VESIM_INPUTTYPE_BUTTON; - break; - case 2: - if (devtype == VESIM_DEVICETYPE_JOYSTICK) { - if (token.length() > 5 && icomp(token.substr(0, 4).c_str(), "Axis")) { - subdevtype = VESIM_SUBDEVTYPE_AXIS; - std::string ssid = token.substr(4); - const char * psid = ssid.c_str(); - for (int k = 0; k < 6; k++) { - if (icomp(psid, subdevnames[k])) { - subdevid = k + VESIM_DEVICE_AXIS_X; - break; - } - } - } - else if (token.length() > 7 && icomp(token.substr(0, 6).c_str(), "Button")) { - subdevtype = VESIM_SUBDEVTYPE_BUTTON; - try - { - subdevid = std::stoi(token.substr(6)); - } - catch (int e) { - (void)e; - } - } - else if (token.length() > 3 && icomp(token.substr(0, 3).c_str(), "POV")) { - subdevtype = VESIM_SUBDEVTYPE_AXIS; - std::string ssid = token.substr(3); - const char * psid = ssid.c_str(); - for (int k = 0; k < 8; k++) { - if (icomp(psid, povaxnames[k])) { - subdevid = k + VESIM_DEVICE_POV; - break; - } - } - } - else if (token.length() > 7 && icomp(token.substr(0, 6).c_str(), "Slider")) { - subdevtype = VESIM_SUBDEVTYPE_AXIS; - try - { - int tmp= std::stoi(token.substr(6)); - switch (tmp) { - case 0: - subdevid = VESIM_DEVICE_SLDR0; - break; - case 1: - subdevid = VESIM_DEVICE_SLDR1; - break; - default: - break; - } - } - catch (int e) { - (void)e; - } - } - } - else if (devtype == VESIM_DEVICETYPE_KEYBOARD) { - subdevtype = VESIM_SUBDEVTYPE_KEY; - for (int k = 0; k < KEYDATA_CNT; k++) { - if (icomp(token.c_str(), keydata[k].keyName)) { - subdevid = keydata[k].oapiID; - break; - } - } - } - break; - case 3: - if (icomp(ptok, "True")) isreverse=true; - break; - default: - break; - } - } - posidx++; - } -#ifdef _DEBUG - fprintf(out_file, "Connection for input \"%s\" is defined as device %d (%s) subdev type:%d subdevid:%d reverse:%d\n", inpname.c_str(), devid, vdev[devid].name.c_str(), subdevtype, subdevid, isreverse); -#endif - if (inpname.length() > 0 && subdevtype > 0 && subdevid >= 0) { - for (size_t k = 0; k < vinp.size(); k++) { - - if (icomp(vinp[k].name.c_str(), inpname.c_str())) { -#ifdef _DEBUG - fprintf(out_file, "Input %d (%s) connected to device %d (%s) subdev type:%d subdevid:%d reverse:%d\n", k, inpname.c_str(), devid, vdev[devid].name.c_str(), subdevtype, subdevid, isreverse); -#endif - connectDeviceToInput(k, devid, subdevtype, subdevid, isreverse, 0); - break; - } - } - } - lineidx++; - } - fdevcfg.close(); - } -#ifdef _DEBUG - fflush(out_file); -#endif - return true; -} - -bool Vesim::addInput(int inputID, char *inputName, int inputType, int defaultValue, bool notifyOnChange) { - int currsize = vinp.size(); - if(currsize >= VESIM_MAX_INPUTS || inputID > VESIM_MAX_INPUTS || inputID < 0) return false; - vinp.emplace_back(inputID, inputName, inputType, defaultValue, notifyOnChange); - inpid2idx[inputID] = currsize; -#ifdef _DEBUG - fprintf(out_file, "Input %d(%s) added with inputType %d, default value %d, notifyOnChange:%d\n", inputID, inputName, inputType, defaultValue, notifyOnChange); - fflush(out_file); -#endif - return true; -} - -bool Vesim::addInput(VesimInputDefinition *vid) { - return addInput(vid->id, vid->name, vid->type, vid->defaultValue, vid->notifyOnChange); -} - -bool Vesim::connectDeviceToInput(int inputidx, int deviceID, int subdeviceType, int subdeviceID, bool reverse, int modifiers) { - int connidx= vinp[inputidx].addConnection(deviceID, subdeviceType, subdeviceID, modifiers, reverse); - if (connidx >= 0) { - if (subdeviceType == VESIM_SUBDEVTYPE_KEY) { - key2conn[subdeviceID][0] = inputidx; - key2conn[subdeviceID][1] = connidx; - } - return true; - } - return false; -} - -int Vesim::clbkConsumeBufferedKey(DWORD key, bool down, char *keystate) { - if (key >= 0 && key < 256) { - int inpidx=key2conn[key][0]; -#ifdef _DEBUG - fprintf(out_file, "Key callback key:%d inpidx:%d \n", (int) key, inpidx); - fflush(out_file); -#endif - boolean isSet = false; - int newValue = 0; - if (inpidx >= 0) { - VesimInput *inp = &vinp[inpidx]; - VesimDeviceInputConn *pconn = &inp->conn[key2conn[key][1]]; - if (down) { - pconn->value = 1; - isSet = true; - if (inp->type == VESIM_INPUTTYPE_BUTTON) { - newValue = pconn->reverse ? 0 : 1; - } - else newValue = pconn->reverse ? 0 : 65535; - } - else { - pconn->value = 0; - if (inp->type == VESIM_INPUTTYPE_BUTTON) { - isSet = true; - newValue = pconn->reverse ? 1 : 0; - } - } - if (!isSet) newValue = inp->defaultValue; - int oldValue = inp->value; - inp->value = newValue; - -#ifdef _DEBUG - fprintf(out_file, "Value changed key:%d oldValue:%d newValue:%d\n", (int)key, oldValue, newValue); - fflush(out_file); -#endif - - if (inp->notifyOnChange && (oldValue != inp->value) && cbInputChanged != NULL) { - int eventType; - if (inp->type == VESIM_INPUTTYPE_AXIS) - eventType = VESIM_EVTTYPE_AXIS_CHANGED; - else if (newValue) - eventType = VESIM_EVTTYPE_BUTTON_ON; - else - eventType = VESIM_EVTTYPE_BUTTON_OFF; - cbInputChanged(inp->ID, eventType, newValue, pCbData); - } - } - - } - return 0; -} - -void Vesim::poolDevices() { - int ndev = vdev.size(); - for (int devid = 0; devid < ndev; devid++) - vdev[devid].poolDevice(); - - int ninp = vinp.size(); - for (int inpidx = 0; inpidx < ninp; inpidx++) { - VesimInput *inp = &vinp[inpidx]; - int newValue=0; - bool isSet = false; - for (int i = 0; i < inp->nconns; i++) { - VesimDeviceInputConn *pconn = &inp->conn[i]; - VesimDevice *pdev = &vdev[pconn->deviceID]; - if (pconn->subdeviceType == VESIM_SUBDEVTYPE_AXIS) { - switch (pconn->subdeviceID) { - case VESIM_DEVICE_AXIS_X: - newValue = pdev->dx8_jstate.lX; - pconn->value = newValue; - isSet = true; - break; - case VESIM_DEVICE_AXIS_Y: - newValue = pdev->dx8_jstate.lY; - pconn->value = newValue; - isSet = true; - break; - case VESIM_DEVICE_AXIS_Z: - newValue = pdev->dx8_jstate.lZ; - pconn->value = newValue; - isSet = true; - break; - case VESIM_DEVICE_AXIS_RX: - newValue = pdev->dx8_jstate.lRx; - pconn->value = newValue; - isSet = true; - break; - case VESIM_DEVICE_AXIS_RY: - newValue = pdev->dx8_jstate.lRy; - pconn->value = newValue; - isSet = true; - break; - case VESIM_DEVICE_AXIS_RZ: - newValue = pdev->dx8_jstate.lRz; - pconn->value = newValue; - isSet = true; - break; - case VESIM_DEVICE_SLDR0: - newValue = pdev->dx8_jstate.rglSlider[0]; - pconn->value = newValue; - isSet = true; - break; - case VESIM_DEVICE_SLDR1: - newValue = pdev->dx8_jstate.rglSlider[1]; - pconn->value = newValue; - isSet = true; - break; - default: //It is a POV axis - int povidx = pconn->subdeviceID- VESIM_DEVICE_POV; - int povval = pdev->dx8_jstate.rgdwPOV[povidx>>1]; - if ((povval & 0xFFFF) != 0xFFFF) { - double povcos = cos(PI*povval / 18000.0); - double povsin = sin(PI*povval / 18000.0); - double maxnorm = max(abs(povcos), abs(povsin)); - povcos = povcos / maxnorm; - povsin = povsin / maxnorm; - if (povidx & 1) { - newValue = min((int)round(32768 - 327678.0*povcos), 65535); - } - else { - newValue = min((int)round(32768 + 327678.0*povsin), 65535); - } - isSet = true; - } - pconn->value = povval; - break; - } - - if (pconn->reverse) newValue = 65535 - newValue; - - if (inp->type == VESIM_INPUTTYPE_BUTTON) { - newValue = newValue > 60000 ? 1:0; - } - } - else if (pconn->subdeviceType == VESIM_SUBDEVTYPE_BUTTON) { - int sdid = pconn->subdeviceID; - if (sdid >= 0 && sdid < 128 && pdev->dx8_jstate.rgbButtons[sdid] & 0x80) { - pconn->value = 1; - isSet = true; - if (inp->type == VESIM_INPUTTYPE_BUTTON) { - newValue = pconn->reverse ? 0 : 1; - } - else newValue = pconn->reverse? 0 : 65535; - } - else { - pconn->value = 0; - if (inp->type == VESIM_INPUTTYPE_BUTTON) { - isSet = true; - newValue = pconn->reverse ? 1 : 0; - } - } - } - else if (pconn->subdeviceType == VESIM_SUBDEVTYPE_KEY) { - if (pconn->value) { - newValue = inp->value; - isSet = true; - } - } - } - - if (!isSet) newValue = inp->defaultValue; - int oldValue = inp->value; - inp->value=newValue; - if (inp->notifyOnChange && (oldValue != inp->value) && cbInputChanged != NULL) { - int eventType; - if (inp->type == VESIM_INPUTTYPE_AXIS) - eventType = VESIM_EVTTYPE_AXIS_CHANGED; - else if (newValue) - eventType = VESIM_EVTTYPE_BUTTON_ON; - else - eventType = VESIM_EVTTYPE_BUTTON_OFF; - cbInputChanged(inp->ID, eventType, newValue, pCbData); - } - } -} - -int Vesim::getInputValue(int inputID) { - int inpsize = vinp.size(); - if (inputID < 0 || inputID >= VESIM_MAX_INPUTS) return 0; - int iidx = inpid2idx[inputID]; - if (iidx < 0) return 0; - return vinp[iidx].value; -} - -void Vesim::createUserConfigs() { - int ndev = vdev.size(); - for (int i = 0; i < ndev; i++) { - VesimDevice *d = &vdev[i]; - std::string cfgname = getDeviceInputFileName(vesselStationName, d->name, true); - if (!std::ifstream(cfgname).good()){ - std::ifstream incfg( - getDeviceInputFileName(vesselStationName, d->name, false), - std::ios::binary); - if(!incfg.good()) - incfg= std::ifstream( - getDeviceInputFileName(vesselStationName, VESIM_CFG_GENERIC, false), - std::ios::binary); - if (incfg.good()) { - std::ofstream outcfg(cfgname, std::ios::binary); - outcfg << incfg.rdbuf(); - } - } - } -} \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/vesim.h b/Orbitersdk/samples/ProjectApollo/src_aux/vesim.h deleted file mode 100644 index bac4226fc7..0000000000 --- a/Orbitersdk/samples/ProjectApollo/src_aux/vesim.h +++ /dev/null @@ -1,145 +0,0 @@ -/*************************************************************************** -This file is part of Project Apollo - NASSP -Copyright 2020 - -Vessel Specific Input Manager - -Project Apollo is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -Project Apollo is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Project Apollo; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -See http://nassp.sourceforge.net/license/ for more details. - -**************************** Revision History ****************************/ - -#pragma once - -#define DIRECTINPUT_VERSION 0x0800 -#include "dinput.h" - -#define VESIM_INPUTTYPE_BUTTON 1 -#define VESIM_INPUTTYPE_AXIS 2 - -#define VESIM_MAX_INPUTS 1024 -#define VESIM_MAX_INPUT_CONNS 16 - -#define VESIM_DEFAULT_AXIS_VALUE 32768 - -#define VESIM_EVTTYPE_BUTTON_ON 1 -#define VESIM_EVTTYPE_BUTTON_OFF 2 -#define VESIM_EVTTYPE_AXIS_CHANGED 2 - - - -class Vesim; - -typedef void (*CbInputChanged)(int inputID, int eventType, int newValue, void *pdata); - -struct VesimInputDefinition { - int id; - char *name; - int type; - int defaultValue; - bool notifyOnChange; -}; - -struct VesimDeviceInputConn { - int deviceID; - int subdeviceType; - int subdeviceID; - int modifiers; - bool reverse; - int value; -}; - -class VesimInput { -private: - int ID; - std::string name; - int type; - int defaultValue; - bool notifyOnChange; - int nconns{ 0 }; - VesimDeviceInputConn conn[VESIM_MAX_INPUT_CONNS]; - - int value; - -public: - VesimInput(int inputID, char *name, int type, int defaultValue, bool notifyOnChange) : - ID(inputID), - name(name), - type(type), - defaultValue(defaultValue), - notifyOnChange(notifyOnChange), - value(defaultValue) - {}; - - int VesimInput::addConnection(int deviceID, int subdeviceType, int subdeviceID, int modifiers, bool reverse); - - friend class VesimDevice; - friend class Vesim; -}; - -class VesimDeviceAxis { -}; - -class VesimDevice { -private: - std::string name; - Vesim *parent; - int type; - std::vector axes; - LPDIRECTINPUTDEVICE8 dx8_joystick {NULL}; - DIJOYSTATE2 dx8_jstate; - - void poolDevice(); - -public: - VesimDevice(Vesim* parent); - VesimDevice(Vesim* parent, const char* deviceName, LPDIRECTINPUTDEVICE8 dx8_joystick); - ~VesimDevice(); - friend class Vesim; -}; - -class Vesim -{ -private: - CbInputChanged cbInputChanged; - void *pCbData; - std::vector vinp; - int inpid2idx[VESIM_MAX_INPUTS]; - int key2conn[256][2]; - - std::vector vdev; - std::vector vconn; - - bool Vesim::connectDeviceToInput(int inputidx, int deviceID, int subdeviceType, int subdeviceID, bool reverse, int modifiers); -public: - char* vesselStationName; - LPDIRECTINPUT8 dx8ppv; - -#ifdef _DEBUG - FILE *out_file; -#endif - Vesim(CbInputChanged cbInputChanged, void *pCbData); - ~Vesim(); - bool addInput(int inputID, char *inputName, int inputType, int defaultValue = VESIM_DEFAULT_AXIS_VALUE, bool notifyOnChange = false); - bool addInput(VesimInputDefinition *vid); - bool setupDevices(char* vesselStationName, LPDIRECTINPUT8 dx8ppv); - int clbkConsumeBufferedKey(DWORD key, bool down, char *keystate); - void poolDevices(); - int getInputValue(int inputID); - void createUserConfigs(); - - friend BOOL CALLBACK VesimEnumJoysticksCB(const DIDEVICEINSTANCE* pdidInstance, VOID* pVesim); -}; \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp index 6eb750e16d..7cfd59aade 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp @@ -1837,7 +1837,6 @@ void Saturn::JoystickTimestep() // Read joysticks and feed data to the computer // Do not do this if we aren't the active vessel. if (oapiGetFocusInterface() == this) { - if (enableVESIM) vesim.poolDevices(); // Invert joystick configuration according to navmode in case of one joystick int tmp_id, tmp_rot_id, tmp_sld_id, tmp_rzx_id, tmp_pov_id, tmp_debug; if (rhc_thctoggle && ((rhc_id != -1 && thc_id == -1 && GetAttitudeMode() == RCS_LIN) || @@ -1873,7 +1872,6 @@ void Saturn::JoystickTimestep() sprintf(oapiDebugString(),"DX8JS: Joystick selected as RHC does not exist."); } - HRESULT hr; ChannelValue val31; e_object *direct_power1, *direct_power2; val31 = agc.GetInputChannel(031); // Get current data @@ -1943,77 +1941,24 @@ void Saturn::JoystickTimestep() int rhc_x_pos = 32768; int rhc_y_pos = 32768; int rhc_rot_pos = 32768; - if (enableVESIM) { - if (GetAttitudeMode() == RCS_ROT) { - rhc_x_pos = vesim.getInputValue(CSM_AXIS_INPUT_RHC_R); - rhc_y_pos = vesim.getInputValue(CSM_AXIS_INPUT_RHC_P); - rhc_rot_pos = vesim.getInputValue(CSM_AXIS_INPUT_RHC_Y); - } - //sprintf(oapiDebugString(), "RHC: X/Y/Z = %d / %d / %d | rzx_id %d rot_id %d", rhc_x_pos, rhc_y_pos, rhc_rot_pos, rhc_rzx_id, rhc_rot_id); + + // Roll + if (GetManualControlLevel(THGROUP_ATT_BANKLEFT) > 0) { + rhc_x_pos = (int) ((1. - GetManualControlLevel(THGROUP_ATT_BANKLEFT)) * 32768.); + } else if (GetManualControlLevel(THGROUP_ATT_BANKRIGHT) > 0) { + rhc_x_pos = (int) (32768. + GetManualControlLevel(THGROUP_ATT_BANKRIGHT) * 32768.); } - else if (rhc_id != -1 && rhc_id < js_enabled) { - hr = dx8_joystick[rhc_id]->Poll(); - if (FAILED(hr)) { // Did that work? - // Attempt to acquire the device - hr = dx8_joystick[rhc_id]->Acquire(); - if (FAILED(hr)) { - sprintf(oapiDebugString(),"DX8JS: Cannot aquire RHC"); - } else { - hr = dx8_joystick[rhc_id]->Poll(); - } - } - // Read data - dx8_joystick[rhc_id]->GetDeviceState(sizeof(dx8_jstate[rhc_id]), &dx8_jstate[rhc_id]); - rhc_x_pos = dx8_jstate[rhc_id].lX; - rhc_y_pos = dx8_jstate[rhc_id].lY; - - // Z-axis read. - if (rhc_rzx_id != -1 && rhc_rot_id == -1) { // Native Z-axis first unless rot is also set - rhc_rot_pos = dx8_jstate[rhc_id].lZ; - } else if (rhc_rot_id != -1) { // Then if this is a rotator-type axis - switch(rhc_rot_id) { - case 0: - rhc_rot_pos = dx8_jstate[rhc_id].lRx; break; - case 1: - rhc_rot_pos = dx8_jstate[rhc_id].lRy; break; - case 2: - rhc_rot_pos = dx8_jstate[rhc_id].lRz; break; - } - } else if (rhc_sld_id != -1) { // Finally if this is a slider - rhc_rot_pos = dx8_jstate[rhc_id].rglSlider[rhc_sld_id]; - } - - // RCS mode toggle - if (rhc_thctoggle && thc_id == -1 && rhc_thctoggle_id != -1) { - if (dx8_jstate[rhc_id].rgbButtons[rhc_thctoggle_id]) { - if (!rhc_thctoggle_pressed) { - SetAttitudeMode(RCS_LIN); - } - rhc_thctoggle_pressed = true; - } else { - rhc_thctoggle_pressed = false; - } - } - // Use Orbiter's attitude control as RHC - } else { - // Roll - if (GetManualControlLevel(THGROUP_ATT_BANKLEFT) > 0) { - rhc_x_pos = (int) ((1. - GetManualControlLevel(THGROUP_ATT_BANKLEFT)) * 32768.); - } else if (GetManualControlLevel(THGROUP_ATT_BANKRIGHT) > 0) { - rhc_x_pos = (int) (32768. + GetManualControlLevel(THGROUP_ATT_BANKRIGHT) * 32768.); - } - // Pitch - if (GetManualControlLevel(THGROUP_ATT_PITCHDOWN) > 0) { - rhc_y_pos = (int) ((1. - GetManualControlLevel(THGROUP_ATT_PITCHDOWN)) * 32768.); - } else if (GetManualControlLevel(THGROUP_ATT_PITCHUP) > 0) { - rhc_y_pos = (int) (32768. + GetManualControlLevel(THGROUP_ATT_PITCHUP) * 32768.); - } - // Yaw - if (GetManualControlLevel(THGROUP_ATT_YAWLEFT) > 0) { - rhc_rot_pos = (int) ((1. - GetManualControlLevel(THGROUP_ATT_YAWLEFT)) * 32768.); - } else if (GetManualControlLevel(THGROUP_ATT_YAWRIGHT) > 0) { - rhc_rot_pos = (int) (32768. + GetManualControlLevel(THGROUP_ATT_YAWRIGHT) * 32768.); - } + // Pitch + if (GetManualControlLevel(THGROUP_ATT_PITCHDOWN) > 0) { + rhc_y_pos = (int) ((1. - GetManualControlLevel(THGROUP_ATT_PITCHDOWN)) * 32768.); + } else if (GetManualControlLevel(THGROUP_ATT_PITCHUP) > 0) { + rhc_y_pos = (int) (32768. + GetManualControlLevel(THGROUP_ATT_PITCHUP) * 32768.); + } + // Yaw + if (GetManualControlLevel(THGROUP_ATT_YAWLEFT) > 0) { + rhc_rot_pos = (int) ((1. - GetManualControlLevel(THGROUP_ATT_YAWLEFT)) * 32768.); + } else if (GetManualControlLevel(THGROUP_ATT_YAWRIGHT) > 0) { + rhc_rot_pos = (int) (32768. + GetManualControlLevel(THGROUP_ATT_YAWRIGHT) * 32768.); } int rhc_pos[3] = { rhc_x_pos, rhc_y_pos, rhc_rot_pos }; @@ -2388,95 +2333,23 @@ void Saturn::JoystickTimestep() int thc_y_pos = 32768; int thc_rot_pos = 32768; - - if (enableVESIM) { - if (GetAttitudeMode() == RCS_ROT) { - thc_x_pos = vesim.getInputValue(CSM_AXIS_INPUT_THC_Y); - thc_y_pos = 65535 - vesim.getInputValue(CSM_AXIS_INPUT_THC_Z); - thc_rot_pos = vesim.getInputValue(CSM_AXIS_INPUT_THC_X); - } - else{ - thc_x_pos = vesim.getInputValue(CSM_AXIS_INPUT_RHC_R); - thc_y_pos = vesim.getInputValue(CSM_AXIS_INPUT_RHC_P); - thc_rot_pos = vesim.getInputValue(CSM_AXIS_INPUT_RHC_Y); - } + // Up/down + if (GetManualControlLevel(THGROUP_ATT_DOWN) > 0) { + thc_y_pos = (int) ((1. - GetManualControlLevel(THGROUP_ATT_DOWN)) * 32768.); + } else if (GetManualControlLevel(THGROUP_ATT_UP) > 0) { + thc_y_pos = (int) (32768. + GetManualControlLevel(THGROUP_ATT_UP) * 32768.); } - else if (thc_id != -1 && thc_id < js_enabled){ - hr = dx8_joystick[thc_id]->Poll(); - if (FAILED(hr)) { // Did that work? - // Attempt to acquire the device - hr = dx8_joystick[thc_id]->Acquire(); - if (FAILED(hr)) { - sprintf(oapiDebugString(),"DX8JS: Cannot aquire THC"); - } else { - hr = dx8_joystick[thc_id]->Poll(); - } - } - // Read data - dx8_joystick[thc_id]->GetDeviceState(sizeof(dx8_jstate[thc_id]), &dx8_jstate[thc_id]); - thc_x_pos = dx8_jstate[thc_id].lX; - thc_y_pos = dx8_jstate[thc_id].lY; - - // Z-axis read. - if (thc_rzx_id != -1 && thc_rot_id == -1) { // Native Z-axis first unless rot is also set - thc_rot_pos = dx8_jstate[thc_id].lZ; - } else if (thc_rot_id != -1){ // Then if this is a rotator-type axis - switch(thc_rot_id){ - case 0: - thc_rot_pos = dx8_jstate[thc_id].lRx; break; - case 1: - thc_rot_pos = dx8_jstate[thc_id].lRy; break; - case 2: - thc_rot_pos = dx8_jstate[thc_id].lRz; break; - } - } else if(thc_sld_id != -1){ // Finally if this is a slider - thc_rot_pos = dx8_jstate[thc_id].rglSlider[thc_sld_id]; - } - - if (thc_pov_id != -1) { - DWORD dwPOV = dx8_jstate[thc_id].rgdwPOV[thc_pov_id]; - if (LOWORD(dwPOV) != 0xFFFF) { - if (dwPOV > 31500 || dwPOV < 4500) { - thc_rot_pos = 65536; - } else if (dwPOV > 13500 && dwPOV < 21500) { - thc_rot_pos = 0; - } - } - //sprintf(oapiDebugString(),"THC: %d", dx8_jstate[thc_id].rgdwPOV[thc_pov_id]); - } - - // RCS mode toggle - if (rhc_thctoggle && rhc_id == -1 && rhc_thctoggle_id != -1) { - if (dx8_jstate[thc_id].rgbButtons[rhc_thctoggle_id]) { - if (!rhc_thctoggle_pressed) { - SetAttitudeMode(RCS_ROT); - } - rhc_thctoggle_pressed = true; - } else { - rhc_thctoggle_pressed = false; - } - } - - // Use Orbiter's attitude control as THC - } else { - // Up/down - if (GetManualControlLevel(THGROUP_ATT_DOWN) > 0) { - thc_y_pos = (int) ((1. - GetManualControlLevel(THGROUP_ATT_DOWN)) * 32768.); - } else if (GetManualControlLevel(THGROUP_ATT_UP) > 0) { - thc_y_pos = (int) (32768. + GetManualControlLevel(THGROUP_ATT_UP) * 32768.); - } - // Left/right - if (GetManualControlLevel(THGROUP_ATT_LEFT) > 0) { - thc_x_pos = (int) ((1. - GetManualControlLevel(THGROUP_ATT_LEFT)) * 32768.); - } else if (GetManualControlLevel(THGROUP_ATT_RIGHT) > 0) { - thc_x_pos = (int) (32768. + GetManualControlLevel(THGROUP_ATT_RIGHT) * 32768.); - } - // Forward/Back - if (GetManualControlLevel(THGROUP_ATT_BACK) > 0) { - thc_rot_pos = (int) ((1. - GetManualControlLevel(THGROUP_ATT_BACK)) * 32768.); - } else if (GetManualControlLevel(THGROUP_ATT_FORWARD) > 0) { - thc_rot_pos = (int) (32768. + GetManualControlLevel(THGROUP_ATT_FORWARD) * 32768.); - } + // Left/right + if (GetManualControlLevel(THGROUP_ATT_LEFT) > 0) { + thc_x_pos = (int) ((1. - GetManualControlLevel(THGROUP_ATT_LEFT)) * 32768.); + } else if (GetManualControlLevel(THGROUP_ATT_RIGHT) > 0) { + thc_x_pos = (int) (32768. + GetManualControlLevel(THGROUP_ATT_RIGHT) * 32768.); + } + // Forward/Back + if (GetManualControlLevel(THGROUP_ATT_BACK) > 0) { + thc_rot_pos = (int) ((1. - GetManualControlLevel(THGROUP_ATT_BACK)) * 32768.); + } else if (GetManualControlLevel(THGROUP_ATT_FORWARD) > 0) { + thc_rot_pos = (int) (32768. + GetManualControlLevel(THGROUP_ATT_FORWARD) * 32768.); } if (thc_voltage > SP_MIN_DCVOLTAGE) { diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp index 839eeccdec..eb9dafd1d0 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp @@ -73,281 +73,6 @@ using namespace nassp; //extern FILE *PanelsdkLogFile; -#define CSM_AXIS_INPUT_CNT 53 -VesimInputDefinition vesim_csm_inputs[CSM_AXIS_INPUT_CNT] = { - { CSM_AXIS_INPUT_RHC_R, "RHC Roll", VESIM_INPUTTYPE_AXIS, VESIM_DEFAULT_AXIS_VALUE, false }, - { CSM_AXIS_INPUT_RHC_P, "RHC Pitch", VESIM_INPUTTYPE_AXIS, VESIM_DEFAULT_AXIS_VALUE, false }, - { CSM_AXIS_INPUT_RHC_Y, "RHC Yaw", VESIM_INPUTTYPE_AXIS, VESIM_DEFAULT_AXIS_VALUE, false }, - { CSM_AXIS_INPUT_THC_X, "THC X", VESIM_INPUTTYPE_AXIS, VESIM_DEFAULT_AXIS_VALUE, false }, - { CSM_AXIS_INPUT_THC_Y, "THC Y", VESIM_INPUTTYPE_AXIS, VESIM_DEFAULT_AXIS_VALUE, false }, - { CSM_AXIS_INPUT_THC_Z, "THC Z", VESIM_INPUTTYPE_AXIS, VESIM_DEFAULT_AXIS_VALUE, false }, - { CSM_BUTTON_INPUT_THC_CCW, "THC Move CCW", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_INPUT_THC_CW, "THC Move CW", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_ROT_LIN, "Rotation/Translation toggle", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_PRO, "Main DSKY PRO", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_KEY_REL, "Main DSKY KEY REL", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_VERB, "Main DSKY VERB", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_NOUN, "Main DSKY NOUN", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_ENTR, "Main DSKY ENTR", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_CLR, "Main DSKY CLR", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_PLUS, "Main DSKY +", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_MINUS, "Main DSKY -", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_RSET, "Main DSKY RSET", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_NUM_0, "Main DSKY Number 0", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_NUM_1, "Main DSKY Number 1", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_NUM_2, "Main DSKY Number 2", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_NUM_3, "Main DSKY Number 3", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_NUM_4, "Main DSKY Number 4", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_NUM_5, "Main DSKY Number 5", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_NUM_6, "Main DSKY Number 6", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_NUM_7, "Main DSKY Number 7", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_NUM_8, "Main DSKY Number 8", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY1_NUM_9, "Main DSKY Number 9", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_PRO, "LEB DSKY PRO", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_KEY_REL, "LEB DSKY KEY REL", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_VERB, "LEB DSKY VERB", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_NOUN, "LEB DSKY NOUN", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_ENTR, "LEB DSKY ENTR", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_CLR, "LEB DSKY CLR", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_PLUS, "LEB DSKY +", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_MINUS, "LEB DSKY -", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_RSET, "LEB DSKY RSET", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_NUM_0, "LEB DSKY Number 0", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_NUM_1, "LEB DSKY Number 1", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_NUM_2, "LEB DSKY Number 2", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_NUM_3, "LEB DSKY Number 3", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_NUM_4, "LEB DSKY Number 4", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_NUM_5, "LEB DSKY Number 5", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_NUM_6, "LEB DSKY Number 6", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_NUM_7, "LEB DSKY Number 7", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_NUM_8, "LEB DSKY Number 8", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DSKY2_NUM_9, "LEB DSKY Number 9", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DIR_ULL, "Direct Ullage", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_THR_ON, "Thrust On", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DVTA_NORM, "DV Thrust A Norm", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DVTA_OFF, "DV Thrust A Off", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DVTB_NORM, "DV Thrust B Norm", VESIM_INPUTTYPE_BUTTON, 0, true }, - { CSM_BUTTON_DVTB_OFF, "DV Thrust B Off", VESIM_INPUTTYPE_BUTTON, 0, true } -}; - -void cbCSMVesim(int inputID, int eventType, int newValue, void *pdata) { - Saturn *pSaturn = (Saturn *)pdata; - if (eventType == VESIM_EVTTYPE_BUTTON_ON) { - switch (inputID) { - case CSM_BUTTON_ROT_LIN: - if (pSaturn->GetAttitudeMode() == RCS_ROT) - pSaturn->SetAttitudeMode(RCS_LIN); - else - pSaturn->SetAttitudeMode(RCS_ROT); - break; - case CSM_BUTTON_INPUT_THC_CCW: - pSaturn->MoveTHC(1); - break; - case CSM_BUTTON_INPUT_THC_CW: - pSaturn->MoveTHC(0); - break; - case CSM_BUTTON_DSKY1_PRO: - pSaturn->dsky.ProceedPressed(); - break; - case CSM_BUTTON_DSKY1_KEY_REL: - pSaturn->dsky.KeyRel(); - break; - case CSM_BUTTON_DSKY1_VERB: - pSaturn->dsky.VerbPressed(); - break; - case CSM_BUTTON_DSKY1_NOUN: - pSaturn->dsky.NounPressed(); - break; - case CSM_BUTTON_DSKY1_ENTR: - pSaturn->dsky.EnterPressed(); - break; - case CSM_BUTTON_DSKY1_CLR: - pSaturn->dsky.ClearPressed(); - break; - case CSM_BUTTON_DSKY1_PLUS: - pSaturn->dsky.PlusPressed(); - break; - case CSM_BUTTON_DSKY1_MINUS: - pSaturn->dsky.MinusPressed(); - break; - case CSM_BUTTON_DSKY1_RSET: - pSaturn->dsky.ResetPressed(); - break; - case CSM_BUTTON_DSKY1_NUM_0: - pSaturn->dsky.NumberPressed(0); - break; - case CSM_BUTTON_DSKY1_NUM_1: - pSaturn->dsky.NumberPressed(1); - break; - case CSM_BUTTON_DSKY1_NUM_2: - pSaturn->dsky.NumberPressed(2); - break; - case CSM_BUTTON_DSKY1_NUM_3: - pSaturn->dsky.NumberPressed(3); - break; - case CSM_BUTTON_DSKY1_NUM_4: - pSaturn->dsky.NumberPressed(4); - break; - case CSM_BUTTON_DSKY1_NUM_5: - pSaturn->dsky.NumberPressed(5); - break; - case CSM_BUTTON_DSKY1_NUM_6: - pSaturn->dsky.NumberPressed(6); - break; - case CSM_BUTTON_DSKY1_NUM_7: - pSaturn->dsky.NumberPressed(7); - break; - case CSM_BUTTON_DSKY1_NUM_8: - pSaturn->dsky.NumberPressed(8); - break; - case CSM_BUTTON_DSKY1_NUM_9: - pSaturn->dsky.NumberPressed(9); - break; - case CSM_BUTTON_DSKY2_PRO: - pSaturn->dsky2.ProceedPressed(); - break; - case CSM_BUTTON_DSKY2_KEY_REL: - pSaturn->dsky2.KeyRel(); - break; - case CSM_BUTTON_DSKY2_VERB: - pSaturn->dsky2.VerbPressed(); - break; - case CSM_BUTTON_DSKY2_NOUN: - pSaturn->dsky2.NounPressed(); - break; - case CSM_BUTTON_DSKY2_ENTR: - pSaturn->dsky2.EnterPressed(); - break; - case CSM_BUTTON_DSKY2_CLR: - pSaturn->dsky2.ClearPressed(); - break; - case CSM_BUTTON_DSKY2_PLUS: - pSaturn->dsky2.PlusPressed(); - break; - case CSM_BUTTON_DSKY2_MINUS: - pSaturn->dsky2.MinusPressed(); - break; - case CSM_BUTTON_DSKY2_RSET: - pSaturn->dsky2.ResetPressed(); - break; - case CSM_BUTTON_DSKY2_NUM_0: - pSaturn->dsky2.NumberPressed(0); - break; - case CSM_BUTTON_DSKY2_NUM_1: - pSaturn->dsky2.NumberPressed(1); - break; - case CSM_BUTTON_DSKY2_NUM_2: - pSaturn->dsky2.NumberPressed(2); - break; - case CSM_BUTTON_DSKY2_NUM_3: - pSaturn->dsky2.NumberPressed(3); - break; - case CSM_BUTTON_DSKY2_NUM_4: - pSaturn->dsky2.NumberPressed(4); - break; - case CSM_BUTTON_DSKY2_NUM_5: - pSaturn->dsky2.NumberPressed(5); - break; - case CSM_BUTTON_DSKY2_NUM_6: - pSaturn->dsky2.NumberPressed(6); - break; - case CSM_BUTTON_DSKY2_NUM_7: - pSaturn->dsky2.NumberPressed(7); - break; - case CSM_BUTTON_DSKY2_NUM_8: - pSaturn->dsky2.NumberPressed(8); - break; - case CSM_BUTTON_DSKY2_NUM_9: - pSaturn->dsky2.NumberPressed(9); - break; - case CSM_BUTTON_DIR_ULL: - pSaturn->DirectUllageButton.VesimSwitchTo(1); - break; - case CSM_BUTTON_THR_ON: - pSaturn->ThrustOnButton.VesimSwitchTo(1); - break; - case CSM_BUTTON_DVTA_NORM: - pSaturn->dVThrust1Switch.VesimSwitchTo(TOGGLESWITCH_UP); - break; - case CSM_BUTTON_DVTA_OFF: - pSaturn->dVThrust1Switch.VesimSwitchTo(TOGGLESWITCH_DOWN); - break; - case CSM_BUTTON_DVTB_NORM: - pSaturn->dVThrust2Switch.VesimSwitchTo(TOGGLESWITCH_UP); - break; - case CSM_BUTTON_DVTB_OFF: - pSaturn->dVThrust2Switch.VesimSwitchTo(TOGGLESWITCH_DOWN); - break; - } - } - else if (eventType == VESIM_EVTTYPE_BUTTON_OFF) { - switch (inputID) { - case CSM_BUTTON_DSKY1_PRO: - pSaturn->dsky.ProceedReleased(); - break; - case CSM_BUTTON_DSKY2_PRO: - pSaturn->dsky2.ProceedReleased(); - break; - case CSM_BUTTON_DIR_ULL: - pSaturn->DirectUllageButton.VesimSwitchTo(0); - break; - case CSM_BUTTON_THR_ON: - pSaturn->ThrustOnButton.VesimSwitchTo(0); - break; - } - } -} - -// DX8 callback for enumerating joysticks -BOOL CALLBACK EnumJoysticksCallback(const DIDEVICEINSTANCE* pdidInstance, VOID* pSaturn) -{ - class Saturn * sat = (Saturn*)pSaturn; // Pointer to us - HRESULT hr; - - if(sat->js_enabled > 1){ // Do we already have enough joysticks? - return DIENUM_STOP; } // If so, stop enumerating additional devices. - - // Obtain an interface to the enumerated joystick. - hr = sat->dx8ppv->CreateDevice(pdidInstance->guidInstance, &sat->dx8_joystick[sat->js_enabled], NULL); - - if(FAILED(hr)) { // Did that work? - return DIENUM_CONTINUE; } // No, keep enumerating (if there's more) - - sat->js_enabled++; // Otherwise, Next! - return DIENUM_CONTINUE; // and keep enumerating -} - -// DX8 callback for enumerating joystick axes -BOOL CALLBACK EnumAxesCallback( const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pSaturn ) -{ - class Saturn * sat = (Saturn*)pSaturn; // Pointer to us - - if (pdidoi->guidType == GUID_ZAxis) { - if (sat->js_current == sat->rhc_id) { - sat->rhc_rzx_id = 1; - } else { - sat->thc_rzx_id = 1; - } - } - - if (pdidoi->guidType == GUID_RzAxis) { - if (sat->js_current == sat->rhc_id) { - sat->rhc_rot_id = 2; - } else { - sat->thc_rot_id = 2; - } - } - - if (pdidoi->guidType == GUID_POV) { - if (sat->js_current == sat->rhc_id) { - sat->rhc_pov_id = 0; - } else { - sat->thc_pov_id = 0; - } - } - return DIENUM_CONTINUE; -} - // // CAUTION: This disables the warning, which is triggered by the use of the "this" pointer in the // initializations of iuCommandConnector, sivbControlConnector and sivbCommandConnector below. @@ -552,7 +277,6 @@ Saturn::Saturn(OBJHANDLE hObj, int fmodel) : ProjectApolloConnectorVessel (hObj, SPSFuelFeedTempSensor("SPS-Fuel-Feed-Temp-Sensor", 0.0, 200.0), SPSOxidizerFeedTempSensor("SPS-Oxidizer-Feed-Temp-Sensor", 0.0, 200.0), SPSEngVlvTempSensor("SPS-Engine-Valve-Temp-Sensor", 0.0, 200.0), - vesim(&cbCSMVesim, this), CueCards(vcidx, this, 11), Failures(this) #pragma warning ( pop ) // disable:4355 @@ -625,17 +349,6 @@ Saturn::~Saturn() ClearMissionManagementMemory(); - // Release DirectX joystick stuff - if(enableVESIM || js_enabled > 0){ - // Release joysticks - while(js_enabled > 0){ - js_enabled--; - dx8_joystick[js_enabled]->Unacquire(); - dx8_joystick[js_enabled]->Release(); - } - dx8ppv->Release(); - dx8ppv = NULL; - } for (int i = 0; i < 2; i++) { delete[] ReticleLineLen[i]; @@ -2717,11 +2430,6 @@ bool Saturn::ProcessConfigFileLine(FILEHANDLE scn, char *line) sscanf(line + 12, "%i", &i); rhc_thctoggle = (i != 0); } - else if (!strnicmp(line, "JOYSTICK_VESIM", 14)) { - int tmp; - sscanf(line + 14, "%i", &tmp); - enableVESIM = (tmp!= 0); - } else if (!strnicmp(line, "VIBRATIONVISUALIZED", 19)) { sscanf(line + 19, "%i", &i); VibrationVisualizationMultiplier = 0.01*(double)i; @@ -3496,8 +3204,6 @@ int Saturn::clbkConsumeBufferedKey(DWORD key, bool down, char *kstate) { if (FirstTimestep) return 0; - if (enableVESIM) vesim.clbkConsumeBufferedKey(key, down, kstate); - if (KEYMOD_SHIFT(kstate)){ // Do DSKY stuff DSKYPushSwitch* dskyKeyChanged = nullptr; @@ -4253,52 +3959,6 @@ void Saturn::GenericLoadStateSetup() // CheckSMSystemsState(); - - // - // Set up joysticks. - // - - HRESULT hr; - // Having read the configuration file, set up DirectX... - hr = DirectInput8Create(dllhandle, DIRECTINPUT_VERSION, IID_IDirectInput8, (void **)&dx8ppv, NULL); // Give us a DirectInput context - if (!FAILED(hr)) { - if (enableVESIM) { - for (int i=0; iEnumDevices(DI8DEVCLASS_GAMECTRL, EnumJoysticksCallback, this, DIEDFL_ATTACHEDONLY); - if (js_enabled == 0) { // Did we get anything? - dx8ppv->Release(); // No. Close down DirectInput - dx8ppv = NULL; // otherwise it won't get closed later - //sprintf(oapiDebugString(), "DX8JS: No joysticks found"); - } - else { - while (x < js_enabled) { // For each joystick - dx8_joystick[x]->SetDataFormat(&c_dfDIJoystick2); // Use DIJOYSTATE2 structure to report data - // Can't do this because we don't own a window. - // dx8_joystick[x]->SetCooperativeLevel(dllhandle, // We want data all the time, - // DISCL_NONEXCLUSIVE | DISCL_BACKGROUND); // and we don't need exclusive joystick access. - - dx8_jscaps[x].dwSize = sizeof(dx8_jscaps[x]); // Initialize size of capabilities data structure - dx8_joystick[x]->GetCapabilities(&dx8_jscaps[x]); // Get capabilities - // Z-axis detection - if ((rhc_id == x && rhc_auto) || (thc_id == x && thc_auto)) { - js_current = x; - dx8_joystick[x]->EnumObjects(EnumAxesCallback, this, DIDFT_AXIS | DIDFT_POV); - } - x++; // Next! - } - } - } - } - else { - // We can't print an error message this early in initialization, so save this reason for later investigation. - dx8_failure = hr; - } } void Saturn::SetGenericStageState() diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.h b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.h index 1ef4f739c6..c9b9be947c 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.h +++ b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.h @@ -72,7 +72,6 @@ #define DIRECTINPUT_VERSION 0x0800 #include "dinput.h" -#include "vesim.h" class IU; class SIBSystems; @@ -858,7 +857,6 @@ class Saturn: public ProjectApolloConnectorVessel, public PanelSwitchListener { DIDEVCAPS dx8_jscaps[2]; ///< Joystick capabilities DIJOYSTATE2 dx8_jstate[2]; ///< Joystick state HRESULT dx8_failure; ///< DX failure reason - Vesim vesim; ///< Vessel Specific Input Mngr int rhc_id; ///< Joystick # for the RHC int rhc_rot_id; ///< ID of ROTATOR axis to use for RHC Z-axis int rhc_sld_id; ///< ID of SLIDER axis to use for RHC Z-axis @@ -875,7 +873,6 @@ class Saturn: public ProjectApolloConnectorVessel, public PanelSwitchListener { bool thc_auto; ///< THC Z-axis auto detection bool rhc_thctoggle; ///< Enable RHC/THC toggle int rhc_thctoggle_id; ///< RHC button id for RHC/THC toggle - bool enableVESIM; ///< Vessel Specific Input Mgmt enabled bool rhc_thctoggle_pressed; ///< Button pressed flag int js_current; diff --git a/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.cpp b/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.cpp index 6b90f276e8..f021591c03 100644 --- a/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.cpp @@ -38,7 +38,7 @@ LCC_MFD::~LCC_MFD(void) return; } -int LCC_MFD::MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) +OAPI_MSGTYPE LCC_MFD::MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) { switch (msg) { diff --git a/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h b/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h index 5eb2896421..5d1e73daf3 100644 --- a/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h +++ b/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h @@ -50,7 +50,7 @@ class LCC_MFD :public MFD2 void set_SLCCDiscreteInput(int n, bool set); void LoadCheckoutProgram(const char *str); - static int MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); + static OAPI_MSGTYPE MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); protected: const LCCMFDButtons m_buttonPages; diff --git a/Orbitersdk/samples/ProjectApollo/src_lm/LEM.cpp b/Orbitersdk/samples/ProjectApollo/src_lm/LEM.cpp index 40f8ef214d..11a1de3004 100644 --- a/Orbitersdk/samples/ProjectApollo/src_lm/LEM.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_lm/LEM.cpp @@ -121,252 +121,6 @@ DLLCLBK void ovcExit(VESSEL *vessel) if (vessel) delete static_cast (vessel); } -#define LM_AXIS_INPUT_CNT 39 -VesimInputDefinition vesim_lm_inputs[LM_AXIS_INPUT_CNT] = { - { LM_AXIS_INPUT_ACAR, "ACA Roll", VESIM_INPUTTYPE_AXIS, VESIM_DEFAULT_AXIS_VALUE, false }, - { LM_AXIS_INPUT_ACAP, "ACA Pitch", VESIM_INPUTTYPE_AXIS, VESIM_DEFAULT_AXIS_VALUE, false }, - { LM_AXIS_INPUT_ACAY, "ACA Yaw", VESIM_INPUTTYPE_AXIS, VESIM_DEFAULT_AXIS_VALUE, false }, - { LM_AXIS_INPUT_TTCAX, "TTCA X", VESIM_INPUTTYPE_AXIS, VESIM_DEFAULT_AXIS_VALUE, false }, - { LM_AXIS_INPUT_TTCAY, "TTCA Y", VESIM_INPUTTYPE_AXIS, VESIM_DEFAULT_AXIS_VALUE, false }, - { LM_AXIS_INPUT_TTCAZ, "TTCA Z", VESIM_INPUTTYPE_AXIS, VESIM_DEFAULT_AXIS_VALUE, false }, - { LM_BUTTON_ROT_LIN, "Rotation/Translation toggle", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_AXIS_INPUT_THROTTLE, "TTCA Throttle", VESIM_INPUTTYPE_AXIS, 0, false }, - { LM_BUTTON_ENG_START, "Engine Start toggle", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_ENG_STOP, "Engine Stop toggle", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DES_RATE_PLUS, "Descent Rate plus", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DES_RATE_MINUS, "Descent Rate minus", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_ABORT, "Abort toggle", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_ABORT_STAGE, "Abort Stage toggle", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_ABORT_STAGE_GRD, "Abort Stage Guard toggle", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_PRO, "DSKY PRO", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_KEY_REL, "DSKY KEY REL", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_VERB, "DSKY VERB", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_NOUN, "DSKY NOUN", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_ENTR, "DSKY ENTR", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_CLR, "DSKY CLR", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_PLUS, "DSKY +", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_MINUS, "DSKY -", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_RSET, "DSKY RSET", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_NUM_0, "DSKY Number 0", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_NUM_1, "DSKY Number 1", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_NUM_2, "DSKY Number 2", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_NUM_3, "DSKY Number 3", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_NUM_4, "DSKY Number 4", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_NUM_5, "DSKY Number 5", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_NUM_6, "DSKY Number 6", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_NUM_7, "DSKY Number 7", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_NUM_8, "DSKY Number 8", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_DSKY_NUM_9, "DSKY Number 9", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_MDCTRL_PGNS, "Mode Control PGNS Auto/Att Hold toggle", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_MDCTRL_PGNS_AUT, "Mode Control PGNS Auto", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_MDCTRL_PGNS_ATH, "Mode Control PGNS Att Hold", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_BUTTON_MDCTRL_PGNS_OFF, "Mode Control PGNS Off", VESIM_INPUTTYPE_BUTTON, 0, true }, - { LM_AXIS_THR_JET_LEVER, "TTCA Throttle/Jets Select lever", VESIM_INPUTTYPE_AXIS, 0, false } -}; - -void cbLMVesim(int inputID, int eventType, int newValue, void *pdata) { - LEM *pLM = (LEM *)pdata; - int state; - if (eventType == VESIM_EVTTYPE_BUTTON_ON) { - switch (inputID) { - case LM_BUTTON_ROT_LIN: - if (pLM->GetAttitudeMode() == RCS_ROT) - pLM->SetAttitudeMode(RCS_LIN); - else - pLM->SetAttitudeMode(RCS_ROT); - break; - case LM_BUTTON_DES_RATE_MINUS: - pLM->agc.SetInputChannelBit(016, DescendMinus, 1); - break; - case LM_BUTTON_DES_RATE_PLUS: - pLM->agc.SetInputChannelBit(016, DescendPlus, 1); - break; - case LM_BUTTON_ENG_START: - //Engine Start Button - pLM->ManualEngineStart.Push(); - pLM->ButtonClick(); - break; - case LM_BUTTON_ENG_STOP: - //Engine Stop Button - pLM->CDRManualEngineStop.Push(); - pLM->ButtonClick(); - break; - case LM_BUTTON_ABORT: - state = pLM->AbortSwitch.GetState(); - if (state == 0) { - pLM->AbortSwitch.SwitchTo(1); - } - else if (state == 1) { - pLM->AbortSwitch.SwitchTo(0); - } - break; - case LM_BUTTON_ABORT_STAGE: - if (pLM->AbortStageSwitch.GetGuardState()) { - state = pLM->AbortStageSwitch.GetState(); - if (state == 0) { - pLM->AbortStageSwitch.SwitchTo(1); - pLM->Sclick.play(); - } - else if (state == 1) { - pLM->AbortStageSwitch.SwitchTo(0); - pLM->Sclick.play(); - } - } - break; - case LM_BUTTON_ABORT_STAGE_GRD: - if (pLM->AbortStageSwitch.GetGuardState()) { - pLM->AbortStageSwitch.SetGuardState(false); - } - else { - pLM->AbortStageSwitch.SetGuardState(true); - } - pLM->ButtonClick(); // guardClick is inaccesible - break; - case LM_BUTTON_DSKY_PRO: - pLM->dsky.ProceedPressed(); - break; - case LM_BUTTON_DSKY_KEY_REL: - pLM->dsky.KeyRel(); - break; - case LM_BUTTON_DSKY_VERB: - pLM->dsky.VerbPressed(); - break; - case LM_BUTTON_DSKY_NOUN: - pLM->dsky.NounPressed(); - break; - case LM_BUTTON_DSKY_ENTR: - pLM->dsky.EnterPressed(); - break; - case LM_BUTTON_DSKY_CLR: - pLM->dsky.ClearPressed(); - break; - case LM_BUTTON_DSKY_PLUS: - pLM->dsky.PlusPressed(); - break; - case LM_BUTTON_DSKY_MINUS: - pLM->dsky.MinusPressed(); - break; - case LM_BUTTON_DSKY_RSET: - pLM->dsky.ResetPressed(); - break; - case LM_BUTTON_DSKY_NUM_0: - pLM->dsky.NumberPressed(0); - break; - case LM_BUTTON_DSKY_NUM_1: - pLM->dsky.NumberPressed(1); - break; - case LM_BUTTON_DSKY_NUM_2: - pLM->dsky.NumberPressed(2); - break; - case LM_BUTTON_DSKY_NUM_3: - pLM->dsky.NumberPressed(3); - break; - case LM_BUTTON_DSKY_NUM_4: - pLM->dsky.NumberPressed(4); - break; - case LM_BUTTON_DSKY_NUM_5: - pLM->dsky.NumberPressed(5); - break; - case LM_BUTTON_DSKY_NUM_6: - pLM->dsky.NumberPressed(6); - break; - case LM_BUTTON_DSKY_NUM_7: - pLM->dsky.NumberPressed(7); - break; - case LM_BUTTON_DSKY_NUM_8: - pLM->dsky.NumberPressed(8); - break; - case LM_BUTTON_DSKY_NUM_9: - pLM->dsky.NumberPressed(9); - break; - case LM_BUTTON_MDCTRL_PGNS: - //Mode Control PGNS - cycle between Auto & Att Hold - if (pLM->ModeControlPGNSSwitch.GetState() < 2) { - pLM->ModeControlPGNSSwitch.SetState(2); - } - else { - pLM->ModeControlPGNSSwitch.SetState(1); - } - break; - case LM_BUTTON_MDCTRL_PGNS_AUT: - pLM->ModeControlPGNSSwitch.SetState(2); - break; - case LM_BUTTON_MDCTRL_PGNS_ATH: - pLM->ModeControlPGNSSwitch.SetState(1); - break; - case LM_BUTTON_MDCTRL_PGNS_OFF: - pLM->ModeControlPGNSSwitch.SetState(0); - break; - } - } - else if (eventType == VESIM_EVTTYPE_BUTTON_OFF) { - switch (inputID) { - case LM_BUTTON_DES_RATE_MINUS: - pLM->agc.SetInputChannelBit(016, DescendMinus, 0); - pLM->Sclick.play();; - break; - case LM_BUTTON_DES_RATE_PLUS: - pLM->agc.SetInputChannelBit(016, DescendPlus, 0); - pLM->Sclick.play();; - break; - case LM_BUTTON_DSKY_PRO: - pLM->dsky.ProceedReleased(); - break; - } - } -} - - -// DS20060302 DX8 callback for enumerating joysticks -BOOL CALLBACK EnumJoysticksCallback(const DIDEVICEINSTANCE* pdidInstance, VOID* pLEM) -{ - class LEM * lem = (LEM*)pLEM; // Pointer to us - HRESULT hr; - - if(lem->js_enabled > 1){ // Do we already have enough joysticks? - return DIENUM_STOP; } // If so, stop enumerating additional devices. - - // Obtain an interface to the enumerated joystick. - hr = lem->dx8ppv->CreateDevice(pdidInstance->guidInstance, &lem->dx8_joystick[lem->js_enabled], NULL); - - if(FAILED(hr)) { // Did that work? - return DIENUM_CONTINUE; } // No, keep enumerating (if there's more) - - lem->js_enabled++; // Otherwise, Next! - return DIENUM_CONTINUE; // and keep enumerating -} - -// DX8 callback for enumerating joystick axes -BOOL CALLBACK EnumAxesCallback( const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pLEM ) -{ - class LEM * lem = (LEM*)pLEM; // Pointer to us - - if (pdidoi->guidType == GUID_ZAxis) { - if (lem->js_current == lem->rhc_id) { - lem->rhc_rzx_id = 1; - } else { - lem->thc_rzx_id = 1; - } - } - - if (pdidoi->guidType == GUID_RzAxis) { - if (lem->js_current == lem->rhc_id) { - lem->rhc_rot_id = 2; - } else { - lem->thc_rot_id = 2; - } - } - - if (pdidoi->guidType == GUID_POV) { - if (lem->js_current == lem->rhc_id) { - lem->rhc_pov_id = 0; - } else { - lem->thc_pov_id = 0; - } - } - return DIENUM_CONTINUE; -} - // Constructor LEM::LEM(OBJHANDLE hObj, int fmodel) : Payload (hObj, fmodel), @@ -457,9 +211,7 @@ LEM::LEM(OBJHANDLE hObj, int fmodel) : Payload (hObj, fmodel), DescentECAContFeeder("Descent-ECA-Cont-Feeder", Panelsdk), AscentECAMainFeeder("Ascent-ECA-Main-Feeder", Panelsdk), AscentECAContFeeder("Ascent-ECA-Cont-Feeder", Panelsdk), - vesim(&cbLMVesim, this), Failures(this) - { dllhandle = g_Param.hDLL; // DS20060413 Save for later InitLEMCalled = false; @@ -499,18 +251,6 @@ LEM::~LEM() sevent.Done(); #endif - // DS20060413 release DirectX stuff - if (enableVESIM || js_enabled > 0) { - // Release joysticks - while(js_enabled > 0){ - js_enabled--; - dx8_joystick[js_enabled]->Unacquire(); - dx8_joystick[js_enabled]->Release(); - } - dx8ppv->Release(); - dx8ppv = NULL; - } - if (aeaa) { delete aeaa; @@ -835,8 +575,6 @@ int LEM::clbkConsumeBufferedKey(DWORD key, bool down, char *keystate) { // rewrote to get key events rather than monitor key state - LazyD - if (enableVESIM) vesim.clbkConsumeBufferedKey(key, down, keystate); - // DS20060404 Allow keys to control DSKY like in the CM if (KEYMOD_SHIFT(keystate)) { // Do DSKY stuff @@ -1565,44 +1303,6 @@ void LEM::PostLoadSetup(bool define_anims) case THREEPOSSWITCH_DOWN: // OFF break; // Handled later } - - HRESULT hr; - // Having read the configuration file, set up DirectX... - hr = DirectInput8Create(dllhandle, DIRECTINPUT_VERSION, IID_IDirectInput8, (void **)&dx8ppv, NULL); // Give us a DirectInput context - if (!FAILED(hr)) { - if (enableVESIM) { - for (int i = 0; iEnumDevices(DI8DEVCLASS_GAMECTRL, EnumJoysticksCallback, this, DIEDFL_ATTACHEDONLY); - if (js_enabled == 0) { // Did we get anything? - dx8ppv->Release(); // No. Close down DirectInput - dx8ppv = NULL; // otherwise it won't get closed later - //sprintf(oapiDebugString(), "DX8JS: No joysticks found"); - } - else { - while (x < js_enabled) { // For each joystick - dx8_joystick[x]->SetDataFormat(&c_dfDIJoystick2); // Use DIJOYSTATE2 structure to report data - dx8_jscaps[x].dwSize = sizeof(dx8_jscaps[x]); // Initialize size of capabilities data structure - dx8_joystick[x]->GetCapabilities(&dx8_jscaps[x]); // Get capabilities - // Z-axis detection - if ((rhc_id == x && rhc_auto) || (thc_id == x && thc_auto)) { - js_current = x; - dx8_joystick[x]->EnumObjects(EnumAxesCallback, this, DIDFT_AXIS | DIDFT_POV); - } - x++; // Next! - } - } - } - } - else { - // We can't print an error message this early in initialization, so save this reason for later investigation. - dx8_failure = hr; - } } void LEM::GetScenarioState(FILEHANDLE scn, void *vs) diff --git a/Orbitersdk/samples/ProjectApollo/src_lm/LEM.h b/Orbitersdk/samples/ProjectApollo/src_lm/LEM.h index 78060e7ac6..729e212339 100644 --- a/Orbitersdk/samples/ProjectApollo/src_lm/LEM.h +++ b/Orbitersdk/samples/ProjectApollo/src_lm/LEM.h @@ -30,8 +30,6 @@ // DS20060413 Include DirectInput #define DIRECTINPUT_VERSION 0x0800 -#include "dinput.h" -#include "vesim.h" #include "dsky.h" #include "IMU.h" #include "cdu.h" @@ -631,16 +629,10 @@ class LEM : public Payload, public PanelSwitchListener { // DS20060413 DirectInput stuff // Handle to DLL instance HINSTANCE dllhandle; - // pointer to DirectInput class itself - LPDIRECTINPUT8 dx8ppv; // Joysticks-Enabled flag / counter - Zero if we aren't using DirectInput, nonzero is the number of joysticks we have. int js_enabled; // Pointers to DirectInput joystick devices - LPDIRECTINPUTDEVICE8 dx8_joystick[2]; // One for THC, one for RHC, ignore extras - DIDEVCAPS dx8_jscaps[2]; // Joystick capabilities - DIJOYSTATE2 dx8_jstate[2]; // Joystick state HRESULT dx8_failure; // DX failure reason - Vesim vesim; ///< Vessel Specific Input Mngr int rhc_id; // Joystick # for the RHC int rhc_rot_id; // ID of ROTATOR axis to use for RHC Z-axis int rhc_sld_id; // ID of SLIDER axis to use for throttle control from joystick configured as ACA diff --git a/Orbitersdk/samples/ProjectApollo/src_lm/lemsystems.cpp b/Orbitersdk/samples/ProjectApollo/src_lm/lemsystems.cpp index 946b4b1f63..ee81acff72 100644 --- a/Orbitersdk/samples/ProjectApollo/src_lm/lemsystems.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_lm/lemsystems.cpp @@ -849,7 +849,6 @@ void LEM::JoystickTimestep(double simdt) { // Joystick read if (oapiGetFocusInterface() == this) { - if (enableVESIM) vesim.poolDevices(); // Invert joystick configuration according to navmode in case of one joystick int tmp_id, tmp_rot_id, tmp_sld_id, tmp_rzx_id, tmp_pov_id, tmp_debug; if (rhc_thctoggle && ((rhc_id != -1 && thc_id == -1 && GetAttitudeMode() == RCS_LIN) || @@ -918,96 +917,28 @@ void LEM::JoystickTimestep(double simdt) // 2520 points per degree. It breaks out of detent at .5 degres, or 1260 pulses. // 480 points per count. - // Read data - HRESULT hr; - // Handle RHC - if (enableVESIM) { - if (GetAttitudeMode() == RCS_ROT) { - rhc_pos[0] = vesim.getInputValue(LM_AXIS_INPUT_ACAR); - rhc_pos[1] = vesim.getInputValue(LM_AXIS_INPUT_ACAP); - rhc_pos[2] = 65536 - vesim.getInputValue(LM_AXIS_INPUT_ACAY); - - } - } - else if (rhc_id != -1 && rhc_id < js_enabled) { - // CHECK FOR POWER HERE - hr = dx8_joystick[rhc_id]->Poll(); - if (FAILED(hr)) { // Did that work? - // Attempt to acquire the device - hr = dx8_joystick[rhc_id]->Acquire(); - if (FAILED(hr)) { - sprintf(oapiDebugString(), "DX8JS: Cannot aquire RHC"); - } - else { - hr = dx8_joystick[rhc_id]->Poll(); - } - } - dx8_joystick[rhc_id]->GetDeviceState(sizeof(dx8_jstate[rhc_id]), &dx8_jstate[rhc_id]); - // Z-axis read. - int rhc_rot_pos = 32768; // Initialize to centered - if (rhc_rot_id != -1) { // If this is a rotator-type axis - switch (rhc_rot_id) { - case 0: - rhc_rot_pos = dx8_jstate[rhc_id].lRx; break; - case 1: - rhc_rot_pos = dx8_jstate[rhc_id].lRy; break; - case 2: - rhc_rot_pos = dx8_jstate[rhc_id].lRz; break; - } - } - if (rhc_rzx_id != -1 && rhc_rot_id == -1) { // If we use the native Z-axis - rhc_rot_pos = dx8_jstate[rhc_id].lZ; - } + // No JS - rhc_pos[0] = dx8_jstate[rhc_id].lX; - rhc_pos[1] = dx8_jstate[rhc_id].lY; - rhc_pos[2] = 65536 - rhc_rot_pos; - - //Let's cheat and give the ACA a throttle lever, if the joystick has one - if (rhc_sld_id != -1) - { - ttca_throttle_pos = dx8_jstate[rhc_id].rglSlider[rhc_sld_id]; - ttca_throttle_pos_dig = (65536.0 - (double)ttca_throttle_pos) / 65536.0; - } - - // RCS mode toggle - if (rhc_thctoggle && thc_id == -1 && rhc_thctoggle_id != -1) { - if (dx8_jstate[rhc_id].rgbButtons[rhc_thctoggle_id]) { - if (!rhc_thctoggle_pressed) { - SetAttitudeMode(RCS_LIN); - } - rhc_thctoggle_pressed = true; - } - else { - rhc_thctoggle_pressed = false; - } - } + // Roll + if (GetManualControlLevel(THGROUP_ATT_BANKLEFT) > 0) { + rhc_pos[0] = (int)(32768 - GetManualControlLevel(THGROUP_ATT_BANKLEFT) * 32768); } - else { - - // No JS - - // Roll - if (GetManualControlLevel(THGROUP_ATT_BANKLEFT) > 0) { - rhc_pos[0] = (int)(32768 - GetManualControlLevel(THGROUP_ATT_BANKLEFT) * 32768); - } - else if (GetManualControlLevel(THGROUP_ATT_BANKRIGHT) > 0) { - rhc_pos[0] = (int)(32768 + GetManualControlLevel(THGROUP_ATT_BANKRIGHT) * 32768); - } - // Pitch - if (GetManualControlLevel(THGROUP_ATT_PITCHDOWN) > 0) { - rhc_pos[1] = (int)(32768 - GetManualControlLevel(THGROUP_ATT_PITCHDOWN) * 32768); - } - else if (GetManualControlLevel(THGROUP_ATT_PITCHUP) > 0) { - rhc_pos[1] = (int)(32768 + GetManualControlLevel(THGROUP_ATT_PITCHUP) * 32768); - } - // Yaw - if (GetManualControlLevel(THGROUP_ATT_YAWLEFT) > 0) { - rhc_pos[2] = (int)(32768 + GetManualControlLevel(THGROUP_ATT_YAWLEFT) * 32768); - } - else if (GetManualControlLevel(THGROUP_ATT_YAWRIGHT) > 0) { - rhc_pos[2] = (int)(32768 - GetManualControlLevel(THGROUP_ATT_YAWRIGHT) * 32768); - } + else if (GetManualControlLevel(THGROUP_ATT_BANKRIGHT) > 0) { + rhc_pos[0] = (int)(32768 + GetManualControlLevel(THGROUP_ATT_BANKRIGHT) * 32768); + } + // Pitch + if (GetManualControlLevel(THGROUP_ATT_PITCHDOWN) > 0) { + rhc_pos[1] = (int)(32768 - GetManualControlLevel(THGROUP_ATT_PITCHDOWN) * 32768); + } + else if (GetManualControlLevel(THGROUP_ATT_PITCHUP) > 0) { + rhc_pos[1] = (int)(32768 + GetManualControlLevel(THGROUP_ATT_PITCHUP) * 32768); + } + // Yaw + if (GetManualControlLevel(THGROUP_ATT_YAWLEFT) > 0) { + rhc_pos[2] = (int)(32768 + GetManualControlLevel(THGROUP_ATT_YAWLEFT) * 32768); + } + else if (GetManualControlLevel(THGROUP_ATT_YAWRIGHT) > 0) { + rhc_pos[2] = (int)(32768 - GetManualControlLevel(THGROUP_ATT_YAWRIGHT) * 32768); } CDR_ACA.Timestep(rhc_pos); @@ -1193,123 +1124,32 @@ void LEM::JoystickTimestep(double simdt) SetRCSJet(3, true); } - // And now the THC... - if (enableVESIM) { - if (LeftTTCATranslSwitch.IsUp()) { - if (GetAttitudeMode() == RCS_ROT) { - thc_x_pos = vesim.getInputValue(LM_AXIS_INPUT_TTCAY) - 32768; - thc_y_pos = vesim.getInputValue(LM_AXIS_INPUT_TTCAX) - 32768; - thc_z_pos = vesim.getInputValue(LM_AXIS_INPUT_TTCAZ) - 32768; - } - else { - thc_x_pos = vesim.getInputValue(LM_AXIS_INPUT_ACAR) - 32768; - thc_y_pos = vesim.getInputValue(LM_AXIS_INPUT_ACAP) - 32768; - thc_z_pos = vesim.getInputValue(LM_AXIS_INPUT_ACAY) - 32768; - } - } - if (vesim.getInputValue(LM_AXIS_THR_JET_LEVER) < 32768) - ttca_throttle_pos = vesim.getInputValue(LM_AXIS_INPUT_THROTTLE); - else { - if (GetAttitudeMode() == RCS_ROT) - ttca_throttle_pos = vesim.getInputValue(LM_AXIS_INPUT_TTCAX); - else - ttca_throttle_pos = vesim.getInputValue(LM_AXIS_INPUT_ACAP); - thc_y_pos = 0; - } - ttca_throttle_pos_dig = (65536.0 - (double)ttca_throttle_pos) / 65536.0; - } - else if (thc_id != -1 && thc_id < js_enabled) { - hr = dx8_joystick[thc_id]->Poll(); - if (FAILED(hr)) { // Did that work? - // Attempt to acquire the device - hr = dx8_joystick[thc_id]->Acquire(); - if (FAILED(hr)) { - sprintf(oapiDebugString(), "DX8JS: Cannot aquire THC"); - } - else { - hr = dx8_joystick[thc_id]->Poll(); - } - } - - if (thc_tjt_id != -1) { - ttca_realistic_throttle = true; - } - - // Read data - dx8_joystick[thc_id]->GetDeviceState(sizeof(dx8_jstate[thc_id]), &dx8_jstate[thc_id]); - // The LM TTCA is even wierder than the CM THC... - - if (LeftTTCATranslSwitch.IsUp()) { - if (thc_tjt_id != -1) { // If Throttle/Jets lever enabled - thc_tjt_pos = dx8_jstate[thc_id].rglSlider[thc_tjt_id]; // Read - } - - thc_y_pos = dx8_jstate[thc_id].lY - 32768; - thc_x_pos = dx8_jstate[thc_id].lX - 32768; - - // Z-axis read. - if (thc_rot_id != -1) { // If this is a rotator-type axis - switch (thc_rot_id) { - case 0: - thc_rot_pos = dx8_jstate[thc_id].lRx; break; - case 1: - thc_rot_pos = dx8_jstate[thc_id].lRy; break; - case 2: - thc_rot_pos = dx8_jstate[thc_id].lRz; break; - } - } - if (thc_rzx_id != -1 && thc_rot_id == -1) { // If we use the native Z-axis - thc_rot_pos = dx8_jstate[thc_id].lZ; - } - - thc_z_pos = thc_rot_pos - 32768; - - if (thc_debug != -1) { - sprintf(oapiDebugString(), "THC: X/Y/Z = %d / %d / %d TJT = %d, Test: %d, thc_rot_id: %d, thc_rzx_id: %d", thc_x_pos, thc_y_pos, - thc_z_pos, thc_tjt_pos, dx8_jstate[thc_id].rgbButtons[1], thc_rot_id, thc_rzx_id); - } - } + + // No JS - // RCS mode toggle - if (rhc_thctoggle && rhc_id == -1 && rhc_thctoggle_id != -1) { - if (dx8_jstate[thc_id].rgbButtons[rhc_thctoggle_id]) { - if (!rhc_thctoggle_pressed) { - SetAttitudeMode(RCS_ROT); - } - rhc_thctoggle_pressed = true; - } - else { - rhc_thctoggle_pressed = false; - } - } + // Up/down + if (GetManualControlLevel(THGROUP_ATT_DOWN) > 0) { + thc_y_pos = (int)((-GetManualControlLevel(THGROUP_ATT_DOWN)) * 32768.); } - else { - // No JS - - // Up/down - if (GetManualControlLevel(THGROUP_ATT_DOWN) > 0) { - thc_y_pos = (int)((-GetManualControlLevel(THGROUP_ATT_DOWN)) * 32768.); - } - else if (GetManualControlLevel(THGROUP_ATT_UP) > 0) { - thc_y_pos = (int)(GetManualControlLevel(THGROUP_ATT_UP) * 32768.); - } - // Left/right - if (GetManualControlLevel(THGROUP_ATT_LEFT) > 0) { - thc_x_pos = (int)((-GetManualControlLevel(THGROUP_ATT_LEFT)) * 32768.); - } - else if (GetManualControlLevel(THGROUP_ATT_RIGHT) > 0) { - thc_x_pos = (int)(GetManualControlLevel(THGROUP_ATT_RIGHT) * 32768.); - } - // Forward/Back - if (GetManualControlLevel(THGROUP_ATT_BACK) > 0) { - thc_z_pos = (int)((-GetManualControlLevel(THGROUP_ATT_BACK)) * 32768.); - } - else if (GetManualControlLevel(THGROUP_ATT_FORWARD) > 0) { - thc_z_pos = (int)(GetManualControlLevel(THGROUP_ATT_FORWARD) * 32768.); - } - - //sprintf(oapiDebugString(), "%f %f", ttca_throttle_pos_dig, ttca_thrustcmd); + else if (GetManualControlLevel(THGROUP_ATT_UP) > 0) { + thc_y_pos = (int)(GetManualControlLevel(THGROUP_ATT_UP) * 32768.); + } + // Left/right + if (GetManualControlLevel(THGROUP_ATT_LEFT) > 0) { + thc_x_pos = (int)((-GetManualControlLevel(THGROUP_ATT_LEFT)) * 32768.); } + else if (GetManualControlLevel(THGROUP_ATT_RIGHT) > 0) { + thc_x_pos = (int)(GetManualControlLevel(THGROUP_ATT_RIGHT) * 32768.); + } + // Forward/Back + if (GetManualControlLevel(THGROUP_ATT_BACK) > 0) { + thc_z_pos = (int)((-GetManualControlLevel(THGROUP_ATT_BACK)) * 32768.); + } + else if (GetManualControlLevel(THGROUP_ATT_FORWARD) > 0) { + thc_z_pos = (int)(GetManualControlLevel(THGROUP_ATT_FORWARD) * 32768.); + } + + //sprintf(oapiDebugString(), "%f %f", ttca_throttle_pos_dig, ttca_thrustcmd); ttca_pos[0] = thc_y_pos; ttca_pos[1] = thc_x_pos; diff --git a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.cpp b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.cpp index af0bccbc41..ba9524066d 100644 --- a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.cpp @@ -1506,13 +1506,13 @@ void ProjectApolloChecklistMFD::RecallStatus (void) { } -int ProjectApolloChecklistMFD::MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) +OAPI_MSGTYPE ProjectApolloChecklistMFD::MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) { switch (msg) { case OAPI_MSG_MFD_OPENED: // Our new MFD mode has been selected, so we create the MFD and // return a pointer to it. - return (int)(new ProjectApolloChecklistMFD (LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam)); + return (OAPI_MSGTYPE)(new ProjectApolloChecklistMFD (LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam)); } return 0; } diff --git a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.h b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.h index efbb1219b5..fdaf7ddc1b 100644 --- a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.h +++ b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.h @@ -42,7 +42,7 @@ class ProjectApolloChecklistMFD: public MFD2 { void RecallStatus (void); void substituteVariables(char *buffer,int buflen); - static int MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); + static OAPI_MSGTYPE MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); MFDConnector conn; vector groups; diff --git a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.cpp b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.cpp index 324949db68..2c5956413e 100644 --- a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.cpp @@ -2472,13 +2472,13 @@ void ProjectApolloMFD::RecallStatus (void) } // MFD message parser -int ProjectApolloMFD::MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) +OAPI_MSGTYPE ProjectApolloMFD::MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) { switch (msg) { case OAPI_MSG_MFD_OPENED: // Our new MFD mode has been selected, so we create the MFD and // return a pointer to it. - return (int)(new ProjectApolloMFD (LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam)); + return (OAPI_MSGTYPE)(new ProjectApolloMFD (LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam)); } return 0; } diff --git a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.h b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.h index 0631dfe000..ad1d577541 100644 --- a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.h +++ b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.h @@ -115,7 +115,7 @@ class ProjectApolloMFD: public MFD2 { void ReadStatus (FILEHANDLE scn); void StoreStatus (void) const; void RecallStatus (void); - static int MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); + static OAPI_MSGTYPE MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); protected: diff --git a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.cpp b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.cpp index f8b5b7d2dd..11e4864200 100644 --- a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.cpp @@ -74,10 +74,10 @@ DLLCLBK void ExitModule(HINSTANCE hDLL) { // Called by Orbiter when mod nGutsUsed = 0; } -int ARoapiModule::MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) { // Message parser, handling MFD open requests +OAPI_MSGTYPE ARoapiModule::MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) { // Message parser, handling MFD open requests switch (msg) { case OAPI_MSG_MFD_OPENED: - return (int)(new ApolloRTCCMFD(LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam, mfd)); // Open an ephemeral RTCC instance each time we make a new RTCC MFD, plus F8, etc/ + return (OAPI_MSGTYPE)new ApolloRTCCMFD(LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam, mfd); // Open an ephemeral RTCC instance each time we make a new RTCC MFD, plus F8, etc/ } return 0; } diff --git a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.h b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.h index 6544d73bc7..3f046670d0 100644 --- a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.h +++ b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.h @@ -35,6 +35,6 @@ class ARoapiModule : public oapi::Module { void clbkPreStep(double simt, double simdt, double mjd); void clbkPostStep(double simt, double simdt, double mjd); void clbkDeleteVessel(OBJHANDLE hVessel); - static int MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); + static OAPI_MSGTYPE MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); }; \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/CoastNumericalIntegrator.cpp b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/CoastNumericalIntegrator.cpp index 5b380f5038..8671abfa39 100644 --- a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/CoastNumericalIntegrator.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/CoastNumericalIntegrator.cpp @@ -510,10 +510,10 @@ void CoastIntegrator2::SetBodyParameters(int p) rect2 = 0.75*OrbMech::power(2.0, -2.0)*100.0; P = BODY_MOON; GMD = 3; - GMO = 0; //3 with L1 model + GMO = 3; //3 with L1 model ZONAL[0] = 0.0; ZONAL[1] = OrbMech::J2_Moon; ZONAL[2] = OrbMech::J3_Moon; ZONAL[3] = 0.0; //L1 model, use this when Orbiter simulates it - //C[0] = 0.0; C[1] = 0.20715e-4; C[2] = 0.34e-4; C[4] = 0.02583e-4; + C[0] = 0.0; C[1] = 0.20715e-4; C[2] = 0.34e-4; C[4] = 0.02583e-4; } } diff --git a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/EnckeIntegrator.cpp b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/EnckeIntegrator.cpp index 1fb5c1afe9..ea4ecd0fba 100644 --- a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/EnckeIntegrator.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/EnckeIntegrator.cpp @@ -706,10 +706,10 @@ void EnckeFreeFlightIntegrator::SetBodyParameters(int p) rect2 = 0.75*OrbMech::power(2.0, -2.0)*100.0; P = BODY_MOON; GMD = 3; - GMO = 0; //3 with L1 model + GMO = 3; //3 with L1 model ZONAL[0] = 0.0; ZONAL[1] = OrbMech::J2_Moon; ZONAL[2] = OrbMech::J3_Moon; ZONAL[3] = 0.0; //L1 model, use this when Orbiter simulates it - //C[0] = 0.0; C[1] = 0.20715e-4; C[2] = 0.34e-4; C[4] = 0.02583e-4; + C[0] = 0.0; C[1] = 0.20715e-4; C[2] = 0.34e-4; C[4] = 0.02583e-4; } } diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.cpp index c303183cc6..2c3292c7c4 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.cpp @@ -746,57 +746,8 @@ int SoundEvent::LoadMissionTimeSoundArray(const SoundLib &soundlib, char *soundn int SoundEvent::InitDirectSound() { - -// LPDIRECTSOUND8 m_pDS; - HRESULT hr; -// LPDIRECTSOUNDBUFFER pDSBPrimary = NULL; - - TRACESETUP("INITDIRECTSOUND"); - - // Create IDirectSound using the primary sound device - hr = DirectSoundCreate8( NULL, &m_pDS, NULL ); - if (hr != DS_OK) - { - TRACE ("ERROR DIRECTSOUNDCREATE") - this->makeInvalid(); - return (false); - } - else TRACE("DIRECTSOUND CREATE OK"); - - // Set DirectSound coop level - hr = m_pDS->SetCooperativeLevel( GetActiveWindow() , DSSCL_PRIORITY ) ; - if (hr != DS_OK) - TRACE ("ERROR DIRECTSOUND SET COOP") - else TRACE("DIRECTSOUND SETCOOP OK"); - - // Get the primary buffer - DSBUFFERDESC dsbd; - ZeroMemory( &dsbd, sizeof(DSBUFFERDESC) ); - dsbd.dwSize = sizeof(DSBUFFERDESC); - dsbd.dwFlags = DSBCAPS_PRIMARYBUFFER; - dsbd.dwBufferBytes = 0; - dsbd.lpwfxFormat = NULL; - - hr = m_pDS->CreateSoundBuffer( &dsbd, &pDSBPrimary, NULL ); - if (hr != DS_OK) - TRACE ("ERROR DIRECTSOUND CREATE SOUND BUFFER") - else TRACE("DIRECTSOUND CREATE SOUND BUFFER OK"); - - WAVEFORMATEX wfx; - ZeroMemory( &wfx, sizeof(WAVEFORMATEX) ); - wfx.wFormatTag = (WORD) WAVE_FORMAT_PCM; - wfx.nChannels = (WORD) 2; - wfx.nSamplesPerSec = (DWORD) 22050; - wfx.wBitsPerSample = (WORD) 16; - wfx.nBlockAlign = (WORD) (wfx.wBitsPerSample / 8 * wfx.nChannels); - wfx.nAvgBytesPerSec = (DWORD) (wfx.nSamplesPerSec * wfx.nBlockAlign); - - hr = pDSBPrimary->SetFormat(&wfx); - if (hr != DS_OK) - TRACE ("ERROR DIRECTSOUND SET FORMAT") - else TRACE("DIRECTSOUND SET FORMAT OK"); - - return(true); + //Stubbed + return (true); } int SoundEvent::PlaySound(char *filenames,int newbuffer, double offset) diff --git a/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn index cc81ba0a93..22f5efa362 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn @@ -65,8 +65,8 @@ Charlie-Brown:ProjectApollo\Saturn5 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 - LMPAD 1351 00000 - LMPAD 1352 00000 + LMPAD 1351 12160 + LMPAD 1352 03363 LMPAD 1452 73631 LMPAD 1453 70750 LMPAD 1454 01660 @@ -580,8 +580,8 @@ LVIMU_END CMPAD1770 30000 CMPAD1771 2200 CMPAD1772 15070 - CMPAD1773 0 - CMPAD1774 0 + CMPAD1773 12160 + CMPAD1774 03363 CMPAD2000 137 CMPAD2001 763 CMPAD2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn index 724f45fb14..78edbe505b 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn @@ -67,8 +67,8 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 - LMPAD 1352 00000 - LMPAD 1353 00000 + LMPAD 1352 12160 + LMPAD 1353 03363 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 @@ -714,8 +714,8 @@ Columbia:ProjectApollo\Saturn5 CMPAD1773 552 CMPAD1774 2200 CMPAD1775 15070 - CMPAD1776 0 - CMPAD1777 0 + CMPAD1776 12160 + CMPAD1777 03363 CMPAD2000 137 CMPAD2001 763 CMPAD2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn index 86412dbe2f..24d2245ede 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn @@ -63,8 +63,8 @@ Yankee-Clipper:ProjectApollo\Saturn5 LMPAD 1244 15643 LMPAD 1326 07351 LMPAD 1327 10050 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1351 00000 LMPAD 1352 00000 LMPAD 1353 00000 @@ -580,8 +580,8 @@ Yankee-Clipper:ProjectApollo\Saturn5 CMPAD1773 552 CMPAD1774 2201 CMPAD1775 21431 - CMPAD1776 0 - CMPAD1777 0 + CMPAD1776 12160 + CMPAD1777 03363 CMPAD2000 137 CMPAD2001 763 CMPAD2002 23 diff --git a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch and Landing.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch and Landing.scn index e54b8b4c9a..9ccae61e9d 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch and Landing.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch and Landing.scn @@ -62,8 +62,8 @@ Odyssey:ProjectApollo/Saturn5 LMPAD 1244 00000 LMPAD 1326 07401 LMPAD 1327 10246 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1351 00000 LMPAD 1352 00000 LMPAD 1353 00000 @@ -564,8 +564,8 @@ Odyssey:ProjectApollo/Saturn5 CMPAD1773 552 CMPAD1774 2210 CMPAD1775 25231 - CMPAD1776 0 - CMPAD1777 0 + CMPAD1776 12160 + CMPAD1777 03363 CMPAD2000 137 CMPAD2001 763 CMPAD2002 23 diff --git a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch.scn index 34f42346fa..5261c18d0b 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch.scn @@ -63,8 +63,8 @@ Odyssey:ProjectApollo/Saturn5 LMPAD 1244 00000 LMPAD 1326 07401 LMPAD 1327 10246 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1351 00000 LMPAD 1352 00000 LMPAD 1353 00000 @@ -568,8 +568,8 @@ Odyssey:ProjectApollo/Saturn5 CMPAD1773 552 CMPAD1774 2210 CMPAD1775 25231 - CMPAD1776 0 - CMPAD1777 0 + CMPAD1776 12160 + CMPAD1777 03363 CMPAD2000 137 CMPAD2001 763 CMPAD2002 23 diff --git a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 14 - Launch with Delay.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 14 - Launch with Delay.scn index d0de7881c9..b4eb6cc44c 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 14 - Launch with Delay.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 14 - Launch with Delay.scn @@ -64,8 +64,8 @@ Kitty-Hawk:ProjectApollo/Saturn5 LMPAD 1244 15643 LMPAD 1326 07351 LMPAD 1327 10050 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1353 00000 LMPAD 1354 00003 LMPAD 1477 00000 @@ -630,8 +630,8 @@ LVIMU_END CMPAD1763 1545 CMPAD1764 2077 CMPAD1765 1571 - CMPAD1766 0 - CMPAD1767 0 + CMPAD1766 12160 + CMPAD1767 03363 CMPAD1770 233 CMPAD1771 502 CMPAD2000 137 diff --git a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 14 - Launch.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 14 - Launch.scn index 24b915c242..109454bedc 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 14 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 14 - Launch.scn @@ -63,8 +63,8 @@ Kitty-Hawk:ProjectApollo/Saturn5 LMPAD 1244 15643 LMPAD 1326 07351 LMPAD 1327 10050 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1353 00000 LMPAD 1354 00003 LMPAD 1477 00000 @@ -629,8 +629,8 @@ LVIMU_END CMPAD1763 1545 CMPAD1764 2077 CMPAD1765 1571 - CMPAD1766 0 - CMPAD1767 0 + CMPAD1766 12160 + CMPAD1767 03363 CMPAD1770 233 CMPAD1771 502 CMPAD2000 137 diff --git a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 15 - Launch.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 15 - Launch.scn index f3e8bf3797..0aace193f1 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 15 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 15 - Launch.scn @@ -63,8 +63,8 @@ Endeavour:ProjectApollo\Saturn5 LMPAD 1315 13146 LMPAD 1326 07351 LMPAD 1327 10050 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1353 00000 LMPAD 1354 00003 LMPAD 1477 00000 @@ -547,8 +547,8 @@ LVDC_BEGIN CMPAD1763 1545 CMPAD1764 2077 CMPAD1765 1571 - CMPAD1766 0 - CMPAD1767 0 + CMPAD1766 12160 + CMPAD1767 03363 CMPAD1770 233 CMPAD1771 474 CMPAD2000 137 diff --git a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 16 - Launch.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 16 - Launch.scn index 96ff89b100..7f1d1afd6d 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 16 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 16 - Launch.scn @@ -79,8 +79,8 @@ Casper:ProjectApollo\Saturn5 LMPAD 1315 13146 LMPAD 1326 07351 LMPAD 1327 10050 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1353 00000 LMPAD 1354 00003 LMPAD 1477 00000 @@ -560,8 +560,8 @@ LVDC_BEGIN CMPAD1763 1532 CMPAD1764 2064 CMPAD1765 1634 - CMPAD1766 0 - CMPAD1767 0 + CMPAD1766 12160 + CMPAD1767 03363 CMPAD1770 233 CMPAD1771 476 CMPAD2000 137 diff --git a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 17 - Launch with Delay.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 17 - Launch with Delay.scn index 19d995428e..59b2e32c61 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 17 - Launch with Delay.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 17 - Launch with Delay.scn @@ -79,8 +79,8 @@ America:ProjectApollo\Saturn5 LMPAD 1315 13146 LMPAD 1326 10110 LMPAD 1327 10342 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1353 00000 LMPAD 1354 00003 LMPAD 1477 00000 @@ -626,8 +626,8 @@ LVDC_BEGIN CMPAD1763 1547 CMPAD1764 2101 CMPAD1765 1606 - CMPAD1766 0 - CMPAD1767 0 + CMPAD1766 12160 + CMPAD1767 03363 CMPAD1770 235 CMPAD1771 502 CMPAD2000 137 diff --git a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 17 - Launch.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 17 - Launch.scn index eac32e88b8..d39f2ac3a0 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 17 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 17 - Launch.scn @@ -78,8 +78,8 @@ America:ProjectApollo\Saturn5 LMPAD 1315 13146 LMPAD 1326 10110 LMPAD 1327 10342 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1353 00000 LMPAD 1354 00003 LMPAD 1477 00000 @@ -625,8 +625,8 @@ LVDC_BEGIN CMPAD1763 1547 CMPAD1764 2101 CMPAD1765 1606 - CMPAD1766 0 - CMPAD1767 0 + CMPAD1766 12160 + CMPAD1767 03363 CMPAD1770 235 CMPAD1771 502 CMPAD2000 137