diff --git a/.gitattributes b/.gitattributes index b81f2447ce..6bf4416c44 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,4 +9,4 @@ # Let's try this for scenario files too *.scn eol=crlf # Do not propagate build script into branches unless requested -appveyor.yml merge=ours +.github/workflows/build.yml merge=ours diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000000..7f4a748eec --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,56 @@ +# This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you need cross-platform coverage. +# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml +name: CMake on a single platform + +on: + push: + branches: [ "CMake" ] + +env: + GH_TOKEN: ${{github.token}} + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: RelWithDebInfo + BUILD_NAME: NASSP-V9.0-Orbiter2024-${{github.run_number}} + +jobs: + build: + + # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac. + # You can convert this to a matrix build if you need cross-platform coverage. + # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix + runs-on: windows-latest + + steps: + - uses: actions/checkout@v4 + + - name: Check dependency cache for Orbiter 2024 x64 + uses: actions/cache@v4 + id: cache + with: + path: ${{github.workspace}}/Orbiter2024-x64.zip + key: O2024-x64-zip + + - name: Download Orbiter 2024 x64 if not cached + if: steps.cache.outputs.cache-hit != 'true' + run: Invoke-WebRequest -Uri https://github.com/orbitersim/orbiter/releases/download/2024/Orbiter-x64.zip -OutFile ${{github.workspace}}/Orbiter2024-x64.zip + + - name: Extract Orbiter + run: Expand-Archive -Force ${{github.workspace}}/Orbiter2024-x64.zip ${{github.workspace}}/Orbiter2024 + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -DORBITER_INSTALL_DIR:STRING="${{github.workspace}}/Orbiter2024" -DFINAL_INSTALL_DIR:STRING="${{github.workspace}}/install" -B ${{github.workspace}}/build -G "Visual Studio 17 2022" -A x64 ${{github.workspace}}/Orbitersdk/samples/ProjectApollo/ + + - name: Build + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 + + - name: Install + run: cmake --install ${{github.workspace}}/build + + - name: Zip output directory + run: Compress-Archive -Path ${{github.workspace}}/install/* -DestinationPath ${{github.workspace}}/${{env.BUILD_NAME}}-x64.zip -Force + + - name: Create GitHub release and tag + run: gh release create ${{env.BUILD_NAME}} ${{github.workspace}}/${{env.BUILD_NAME}}-x64.zip --target CMake \ No newline at end of file diff --git a/.gitignore b/.gitignore index e54c63e7e8..3ca32845a0 100644 --- a/.gitignore +++ b/.gitignore @@ -143,3 +143,26 @@ XRSound/ /.ninja_deps # Ignore Matlab log analyzers /*.m +/Orbitersdk/samples/ProjectApollo/CMakeSettings.json +/Extern +/GravityModels +/packages/ldoc +/pl +/CMakeDoxyfile.in +/CMakeDoxygenDefaults.cmake +/lfs.dll +/lfs.exp +/lfs.ilk +/lfs.lib +/lfs.pdb +/lua.dll +/lua.exp +/lua.ilk +/lua.lib +/lua.pdb +/SketchpadOutput2.dds +/zlibd.dll +/zlibd.exp +/zlibd.ilk +/zlibd.lib +/zlibd.pdb diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2a326f552f..ee32049343 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,10 +8,9 @@ This guide is a work in progress and will be updated in the future. ## Building To build the project you will need a working installation of Orbiter developed by Martin Schweiger. These are all the requirements for a working development environment -* [Orbiter Beta](http://orbit.medphys.ucl.ac.uk/betainstall.html) -* [D3D9 Client for orbiter](https://www.orbiter-forum.com/showthread.php?t=18431) -* NASSP Orbiter2016 (or derivative) branch checked out inside the Orbiter installation -* Visual Studio (2017, 2019, or 2022) +* [Orbiter 2024 x64](https://github.com/orbitersim/orbiter/releases/tag/2024) +* NASSP Orbiter2024 (or derivative) branch checked out inside the Orbiter installation +* Visual Studio 2019 or 2022 (2022 is preferred) ## Submitting changes To get your work included in the project we ask you to make a pull request with a brief summary of the changes you did followed by details of your implementation. diff --git a/COPYING.txt b/COPYING.txt deleted file mode 100644 index d4d5df3803..0000000000 --- a/COPYING.txt +++ /dev/null @@ -1,31 +0,0 @@ - BE AWARE: YOU CANNOT LEGALLY CREATE A COMBINED - BINARY DISTRIBUTION OF NASSP AND ORBITER! - -NASSP is a DLL plugin for a non-Free software program, Orbiter. - -The GPL v2 does not permit the DISTRIBUTION of a combined Free DLL and -non-Free program. - -The USAGE of such a combination is perfectly legal, as the GPL v2 is a -DISTRIBUTION license and not a USAGE license. The GPL specifically -states it only covers COPYING, MODIFICATION, and DISTRIBUTION of -software and not RUNNING of software. - -A violation occurs only when someone combines the GPL library with the -closed source component and then distributes the result. - -Only the copyright holders of the project have a course of action if -someone does combine the works and distribute them. - -We do include GPLed code from other projects. The copyright holders of -those projects can take action against anyone who distributes a combined -NASSP/Orbiter binary, but they cannot take action against us, or anyone -who merely uses NASSP with Orbiter. Only the act of distribution of a -combined NASSP/Orbiter binary package can create a violation. - -Remember, the GPL is a license that we, the copyright holders, grant. We -own the rights. We are the only people who can bother anyone else for -violating the terms of the license. - -Please refer to the GPL v2, available in the repository root directory -as NASSP-LICENSE.txt, for more information. diff --git a/Config/ProjectApollo/Earth.cfg b/Config/ProjectApollo/Earth.cfg deleted file mode 100644 index d3571a44b6..0000000000 --- a/Config/ProjectApollo/Earth.cfg +++ /dev/null @@ -1,82 +0,0 @@ -; === Configuration file for planet Earth === -Name = Earth -Module = Earth -Module_Atm = EarthAtmJ71G ; default atmosphere model if no user selection -ErrorLimit = 1e-8 -SamplingInterval = 79 ; interpolation sampling interval [s] - ; (interpolation error ~0.1m) -; === Physical Parameters === -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 -AlbedoRGB = 0.7 0.85 1.0 - -; === Rotation and precession parameters === -; ref: see www.orbiter-forum.com/showthread.php?t=8185 -PrecessionLAN = 0 ; [rad] -PrecessionObliquity = 0 ; [rad] -PrecessionPeriod = -9413040.4 ; precession period (days) = 25771.5 years -LAN = 0 ; [rad] -LAN_MJD = 51544.5 ; [MJD] -SidRotOffset = 4.88948754 ; [rad] -SidRotPeriod = 86164.10132 ; [s] -Obliquity = 0.4090928023 ; [rad] - -; === Atmospheric Parameters === -;AtmPressure0 = 101.4e3 ; pressure at zero altitude [Pa] (defined via module) -AtmDensity0 = 1.293 ; density at zero altitude [kg/m^3] -AtmGasConstant = 286.91 ; specific gas constant [J/(K kg)] -AtmGamma = 1.4 ; specific heat ratio c_p/c_v -;AtmAltLimit = 200e3 ; cutoff altitude [m] -AtmAttenuationAlt = 100e3; ; cutoff altitude for light attenuation -AtmHorizonAlt = 64e3 ; horizon rendering altitude [m] -AtmHazeExtent = 0.14 ; horizon haze extent -AtmColor0 = 0.55 0.75 1.04 -AtmHazeColor = 0.6 0.8 1.0 -AtmFogParam = 5e-5 3e-5 4e3 -AtmFogColor = 0.55 0.85 1.10 - -; === Cloud parameters === -CloudAlt = 7e3 ; altitude of cloud layer -CloudRotPeriod = 1e6 -CloudShadowDepth = 0.3 -CloudMicrotextureAlt = 35e3 300e3 - -; === Visualisation Parameters === -TileFormat = 2 -CloudFormat = 2 -MaxPatchResolution = 19 ; surface texture resolution limit (1-14) -MinCloudResolution = 1 ; cloud layer from this resolution -MaxCloudResolution = 9 ; highest cloud resolution level -SpecularRipple = TRUE ; enable specular water microtexture - -; === Surface Bases === -BEGIN_SURFBASE -DIR ProjectApollo\Earth\Base -END_SURFBASE - -; === Fixed surface observation points === -BEGIN_OBSERVER -KSC:LCC: -80.6529 +28.5800 20 -KSC:VAB: -80.65336 28.57944 3.22 ; High Bay 3 crawlerway -KSC:Press Site: -80.648290 +28.575633 6 -KSC:Causeway: -80.621459 +28.510921 7 -KSC:Crawlerway: -80.621657 +28.588825 7 -KSC:Pad 39A FSS:-80.60857 28.60112 90.00 -KSC:Pad 39A Water Tower:-80.60723 28.60225 100.00 -KSC:Pad 39A hardstand:-80.60796 28.59991 17.00 -KSC:Pad 39A crawlerway:-80.60834 28.59715 5.00 -KSC:Pad 39B: -80.6226 +28.6179 5 -KSC:Pad 39B Water Tower: -80.62361 28.62099 110.00 -KSC:SLF: -80.69935 +28.61021 2.8 -KSC:Playalinda DOAMS: -80.694552 +28.704287 6 -KSC:UCS-23 ATOTS: -80.562239 +28.503494 6 -KSC:Cocoa Beach DOAMS: -80.628652 +28.347573 6 -EDW:Tower: -117.88416 34.91723 50.00 -END_OBSERVER - -; === VOR transmitters === -BEGIN_NAVBEACON -END_NAVBEACON diff --git a/Config/ProjectApollo/Earth/Base/Canaveral.cfg b/Config/ProjectApollo/Earth/Base/Canaveral.cfg deleted file mode 100644 index 0c7b0ec57f..0000000000 --- a/Config/ProjectApollo/Earth/Base/Canaveral.cfg +++ /dev/null @@ -1,184 +0,0 @@ -BASE-V2.0 -Name = Cape Canaveral -Location = -80.675 +28.5208 -Size = 1000 - -BEGIN_NAVBEACON -VOR KSCX -80.53835 28.43352 112.70 500 -END_NAVBEACON - -BEGIN_OBJECTLIST -MESH - FILE ProjectApollo\VAB_interior - OWNMATERIAL - ROT 15 - POS -7256 -3.8 2345 - PRELOAD -END -MESH - FILE ProjectApollo\KSCCrawlerway1 - UNDERSHADOWS - OWNMATERIAL - POS -7350 -4.0 2844 - ROT -1.5 - PRELOAD -END -MESH - FILE ProjectApollo\KSCCrawlerway2 - UNDERSHADOWS - OWNMATERIAL - POS -8027 -5.8 4545 - PRELOAD -END -MESH - FILE ProjectApollo\KSCCrawlerway3 - UNDERSHADOWS - OWNMATERIAL - POS -9076 -8.5 6517 - PRELOAD -END -; --- Pad 39B concrete hardstand --- -MESH - FILE ProjectApollo\CanaveralLC39A - UNDERSHADOWS - OWNMATERIAL - POS -11790 11.4 5330 - ROT 89.5 - SCALE 1 - PRELOAD -END -LPAD2 - POS -11026 0 4966.5 - ROT 180 - SCALE 0 - TEX Lpad02 -END -;MESH -; FILE ProjectApollo\Saturn1bML -; SHADOW -; OWNMATERIAL -; POS -11040 75 4962 -; ROT -90 -;END -; -- Pad 39A concrete hardstand -- -MESH - FILE ProjectApollo\CanaveralLC39A - UNDERSHADOWS - OWNMATERIAL - POS -9690 11.4 6970 - ROT 89.5 - SCALE 1 - PRELOAD -END -LPAD2 - POS -8951.4 0 6647.2 - ROT 180 - SCALE 0 - TEX Lpad02 -END -; --- Pad 34 --- -MESH - FILE ProjectApollo\CanaveralLC34Pad - UNDERSHADOWS - OWNMATERIAL - POS -120 -9.21 11120 - ROT 270 - PRELOAD -END -LPAD1 - POS 631 0 10812.2 - SCALE 0 - ROT 220 - TEX Lpad02 -END -; --- Pad 37 --- -MESH - FILE ProjectApollo\CanaveralLC37 - UNDERSHADOWS - OWNMATERIAL - POS -1250 -0.3 10540 - ROT 58 - PRELOAD -END -LPAD1 ; Pad A NEEDS COORDINATES - POS 631 0 10812.2 - SCALE 0 - ROT 220 - TEX Lpad02 -END -LPAD1 ; Pad B NEEDS COORDINATES - POS 631 0 10812.2 - SCALE 0 - ROT 220 - TEX Lpad02 -END -; --- Rest of Canaveral --- -RUNWAY - END1 6860 0 11805 - END2 4978 0 9398 - WIDTH 100 - ILS1 132.6 - ILS2 132.6 - RWTEX Runway2 - NRWSEG 9 - RWSEG1 1 0.018 0.25 0.5 1 0.875 - RWSEG2 1 0.088 0 0.25 0.5 0 - RWSEG3 1 0.018 0.25 0.5 0.75 0.625 - RWSEG4 1 0.088 0 0.25 0.5 0 - RWSEG5 5 0.576 0 0.25 1 0.5 - RWSEG6 1 0.088 0 0.25 0.5 0 - RWSEG7 1 0.02 0.25 0.5 0.625 0.75 - RWSEG8 1 0.088 0 0.25 0 0.5 - RWSEG9 1 0.02 0.25 0.5 0.875 1 -END -RUNWAYLIGHTS - END1 6860 -13 11805 - END2 4978 -7 9398 - WIDTH 100 -END -END_OBJECTLIST - -BEGIN_SURFTILELIST -2 -462 160 3 -2 -461 160 3 -2 -462 161 3 -2 -461 161 3 -2 -462 162 3 -2 -461 162 3 -2 -462 163 3 -2 -461 163 3 -2 -460 164 3 -3 -920 320 3 -3 -919 320 3 -3 -918 320 3 -3 -917 320 3 -3 -920 321 3 -3 -919 321 3 -3 -918 321 3 -3 -920 322 3 -3 -919 322 3 -3 -918 322 3 -3 -920 323 3 -3 -919 323 3 -3 -918 323 3 -3 -917 323 3 -3 -920 324 3 -3 -919 324 3 -3 -918 324 3 -3 -917 324 3 -3 -920 325 3 -3 -917 325 3 -3 -920 326 3 -3 -919 326 3 -3 -918 326 3 -3 -920 327 3 -3 -919 327 3 -4 -1838 650 3 -4 -1837 650 3 -4 -1836 650 3 -4 -1835 650 3 -4 -1838 651 3 -4 -1837 651 3 -4 -1836 651 3 -4 -1835 651 3 -END_SURFTILELIST diff --git a/Config/ProjectApollo/Earth_VirtualAGC.cfg b/Config/ProjectApollo/Earth_VirtualAGC.cfg index 30636bfa5f..f8d1162dbd 100644 --- a/Config/ProjectApollo/Earth_VirtualAGC.cfg +++ b/Config/ProjectApollo/Earth_VirtualAGC.cfg @@ -8,10 +8,13 @@ SamplingInterval = 79 ; interpolation sampling interval [s] ; === Physical Parameters === Mass = 5.97374033e+24 ; reverse calculated with Orbiter's gravitational constant to match GSOPs G*M Size = 6.373338e6 ; launch pad radius, mandatory as long as Orbiter's Earth is spherical -JCoeff = 1082.6269e-6 -2.51e-6 -1.60e-6 -0.15e-6 - ; harmonic coefficients for shape description AlbedoRGB = 0.7 0.85 1.0 +; === Gravity Models === +GravModelPath = egm96_to360.tab ; the name of the gravity model file to load, located in /GravityModels +GravCoeffCutoff = 10 ; the maximum number of terms to load. +;JCoeff = 1082.6269e-6 -2.51e-6 -1.60e-6 -0.15e-6 ; harmonic coefficients for shape description, + ; === Rotation and precession parameters === ; ref: see www.orbiter-forum.com/showthread.php?t=8185 PrecessionLAN = 0 ; [rad] @@ -32,11 +35,10 @@ AtmGamma = 1.4 ; specific heat ratio c_p/c_v AtmAttenuationAlt = 100e3; ; cutoff altitude for light attenuation AtmHorizonAlt = 80e3 ; horizon rendering altitude [m] AtmHazeExtent = 0.14 ; horizon haze extent -;AtmColor0 = 0.55 0.75 1.04 -AtmColor0 = 0.42 0.72 1.02 -AtmHazeColor = 0.55 0.75 1.0 -AtmFogParam = 3.7e-5 2.0e-5 5e3 ; 4.0e-5 2.2e-5 5e3 -AtmFogColor = 0.57 0.80 0.92 +AtmColor0 = 0.42 0.63 0.92 +AtmHazeColor = 0.57 0.74 1.0 +AtmFogParam = 4e-5 2.0e-5 5e3 +AtmFogColor = 0.58 0.77 0.98 AtmTintColor = 0.04 0.05 0.20 ; additive tint to surfaces from high altitude ShadowDepth = 0.65 @@ -51,11 +53,13 @@ CloudMicrotextureAlt = 35e3 300e3 TileFormat = 2 CloudFormat = 2 LabelFormat = 2 -MaxPatchResolution = 19 ; surface texture resolution limit (1-19) +MaxPatchResolution = 21 ; surface texture resolution limit (1-21) MinCloudResolution = 1 ; cloud layer from this resolution MaxCloudResolution = 9 ; highest cloud resolution level ElevationResolution = 0.5 ; target resolution of elevation data [m] SpecularRipple = TRUE ; enable specular water microtexture +MaxElevation = 9000 +MinElevation = -420 MarkerPath = Config\ProjectApollo\Earth_VirtualAGC ; === Surface Bases === diff --git a/Config/ProjectApollo/Moon.cfg b/Config/ProjectApollo/Moon.cfg index 802dd5943a..f68fb0e465 100644 --- a/Config/ProjectApollo/Moon.cfg +++ b/Config/ProjectApollo/Moon.cfg @@ -6,7 +6,12 @@ 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/Orbiter Technical Reference.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. +;JCoeff = 207.108e-6 -2.1e-5 ; GSOP Colossus 3, comment out the above two lines and uncomment this to use the old gravity model. ; === Rotation and precession parameters === ; ref: see www.orbiter-forum.com/showthread.php?t=8185 @@ -31,10 +36,12 @@ SidRotPeriod = 2360588.15 ; === Visualisation Parameters === TileFormat = 2 LabelFormat = 2 -MaxPatchResolution = 18 ; highest sphere patch level +MaxPatchResolution = 20 ; highest sphere patch level ElevationResolution = 0.5 ; target resolution of elevation data [m] HorizonExcess = 0.015 ; prevent mountain tops beyond sphere horizon from disappearing MarkerPath = Config\ProjectApollo\Moon +MaxElevation = 10800 +MinElevation = -9200 ; === Surface Bases === BEGIN_SURFBASE diff --git a/Config/ProjectApollo/Sol.cfg b/Config/ProjectApollo/Sol.cfg deleted file mode 100644 index c6fd13e33a..0000000000 --- a/Config/ProjectApollo/Sol.cfg +++ /dev/null @@ -1,33 +0,0 @@ -; === Configuration file for solar system === -Name = ProjectApollo\Sol - -Star1 = Sun -Planet1 = Mercury -Planet2 = Venus -Planet3 = ProjectApollo\Earth -Earth:Moon1 = ProjectApollo\Moon -Planet4 = Mars -Mars:Moon1 = Phobos -Mars:Moon2 = Deimos -Planet5 = Jupiter -Jupiter:Moon1 = Io -Jupiter:Moon2 = Europa -Jupiter:Moon3 = Ganymede -Jupiter:Moon4 = Callisto -Planet6 = Saturn -Saturn:Moon1 = Mimas -Saturn:Moon2 = Enceladus -Saturn:Moon3 = Tethys -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 -Planet8 = Neptune -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/.gitignore b/Orbitersdk/samples/ProjectApollo/.gitignore new file mode 100644 index 0000000000..345dc6cfe2 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/.gitignore @@ -0,0 +1,12 @@ +CMakeLists.txt.user +CMakeCache.txt +CMakeFiles +CMakeScripts +Testing +Makefile +cmake_install.cmake +install_manifest.txt +compile_commands.json +CTestTestfile.cmake +_deps +out/ \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt new file mode 100644 index 0000000000..017251d91e --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -0,0 +1,149 @@ +cmake_minimum_required(VERSION 3.19) + +# Set the project name +project(NASSP VERSION 9.0) + +# Set C++ compiler variables +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +if(CMAKE_SIZEOF_VOID_P EQUAL 8) # 64-bit build? + set(BUILD64 1) + set(ARCH "x64") + set(PLATFORM_STRING "x64") +else() + set(BUILD64 0) + set(ARCH "x86") + set(PLATFORM_STRING "Win32") +endif() + +if (NOT ${CMAKE_GENERATOR} STREQUAL "Ninja") + add_compile_options(/MP) +endif() + +#Add /permissive if using C++20 or higher +#add_compile_options(/permissive) + +# Group projects in VS +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +# Set NASSP-related variables +set(NASSP_SOURCE_ROOT ${CMAKE_SOURCE_DIR}) +set(NASSP_REPO_ROOT ${NASSP_SOURCE_ROOT}/../../../) + +# Check if the user has specified a non-default Orbiter installation location. +# If not, use the default and alert the user. +set(ORBITER_INSTALL_DIR ${NASSP_REPO_ROOT} CACHE STRING "Location of OpenOrbiter installation directory") +set(ORBITERSDK_DIR ${ORBITER_INSTALL_DIR}/Orbitersdk) + +# Allow having a separate installation directory than the Orbiter installation folder. +# This is generally meant for automated build systems or for folks who want to produce +# an installation package of just NASSP's data and modules without +# including Orbiter data or any NASSP git data or source files. +set(FINAL_INSTALL_DIR ${ORBITER_INSTALL_DIR} CACHE STRING "Location for final build/file copy output, defaults to your chosen Orbiter install directory") + +if(EXISTS ${ORBITER_INSTALL_DIR}/lua.dll) + set(OPENORBITER ON) + message("[NASSP] Configured for OpenOrbiter build.") +else() + set(OPENORBITER OFF) + message("[NASSP] Configured for Orbiter Beta build.") +endif() + +# Microsoft Visual C compiler specific options +if(MSVC) + # Flag pointer truncation as an error because if it happens that's bad news! + add_compile_options("/we4311") + # We need to force the linker to compile us against the statically-linked + # C runtime when building for Orbiter Beta due to XRSound. + if(NOT OPENORBITER) + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + #add_compile_options("/MT") + endif() + add_link_options("/NODEFAULTLIB:LIBCMTD") +endif() + +# Set project libraries to output their DLL files and debug info to +# the final installation dir's "Modules/ProjectApollo" directory, +# unless a sub-project's CMakeLists.txt file overrides this locally, +# such as MFDs, which need to go in "Modules/Plugins" or PanelSDK, +# which can stay in the default directory since it's statically linked. +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/ProjectApollo) +# Workaround for buildbot appending build config name to output path. +# If we start building with another config besides "RelWithDebInfo", this needs +# to be changed in this file and any projects which output to a different directory, +# such as MFDs or ProjectApolloConfigurator. +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${FINAL_INSTALL_DIR}/Modules/ProjectApollo) + +# Sub-projects are what actually build all our vessels, MFDs, etc. +add_subdirectory(Project/PanelSDK) +add_subdirectory(Project/ApolloRTCCMFD) +add_subdirectory(Project/ASTP) +add_subdirectory(Project/CMChute) +add_subdirectory(Project/Crawler) +add_subdirectory(Project/EVA) +add_subdirectory(Project/Flag) +add_subdirectory(Project/FloatBag) +add_subdirectory(Project/Floodlight) +add_subdirectory(Project/LC34) +add_subdirectory(Project/LC37) +add_subdirectory(Project/LCC) +add_subdirectory(Project/LEM) +add_subdirectory(Project/LES) +add_subdirectory(Project/LEVA) +add_subdirectory(Project/LRV) +add_subdirectory(Project/MCC) +add_subdirectory(Project/ML) +add_subdirectory(Project/MSS) +add_subdirectory(Project/ProjectApolloConfigurator) +add_subdirectory(Project/ProjectApolloMFD) +add_subdirectory(Project/Saturn1B) +add_subdirectory(Project/Saturn5) +add_subdirectory(Project/s1b) +add_subdirectory(Project/s1c) +add_subdirectory(Project/Sat1bAbort1) +add_subdirectory(Project/Sat1bAbort2) +add_subdirectory(Project/Sat5Abort1) +add_subdirectory(Project/Sat5Abort2) +add_subdirectory(Project/Sat5Abort3) +add_subdirectory(Project/Sat5LMDSC) +add_subdirectory(Project/sii) +add_subdirectory(Project/SIVB) +add_subdirectory(Project/Skylab) +add_subdirectory(Project/sm) +add_subdirectory(Project/VAB) + + +# Copy all relevant documents/scenarios/sounds/configs from this +# repository into the configured final destination directory. +# This will only happen if the NASSP repo is NOT located inside +# the Orbiter installation directory. If we are located +# inside an Orbiter installation, we can't easily differentiate +# between our own files and those included with Orbiter. +if(${NASSP_REPO_ROOT} STREQUAL ${ORBITER_INSTALL_DIR}) + message("[NASSP] Refusing to copy config files, NASSP is cloned directly into an Orbiter installation.") +elseif(${NASSP_REPO_ROOT} STREQUAL ${FINAL_INSTALL_DIR}) + message("[NASSP] Unnecessary to copy config files, final output directory is the NASSP repo location.") +else() + message("[NASSP] Copying config/data files to final destination directory is possible with \"Install\".") + message("[NASSP] Final destination directory: ${FINAL_INSTALL_DIR}") + + # Create the list of input directories to be copied to the install location + set(NASSP_INSTALL_DIR_LIST + "Config" + "Doc" + "Html" + "Meshes" + "Missions" + "Scenarios" + "Script" + "Sound" + "Textures" + "XRSound" + ) + + file(TO_CMAKE_PATH ${FINAL_INSTALL_DIR} destination_fixed) + foreach(dir ${NASSP_INSTALL_DIR_LIST}) + install(DIRECTORY ${NASSP_REPO_ROOT}/${dir} DESTINATION ${destination_fixed}) + endforeach() +endif() diff --git a/Orbitersdk/samples/ProjectApollo/CMakeSettings.json b/Orbitersdk/samples/ProjectApollo/CMakeSettings.json new file mode 100644 index 0000000000..74f9ee5249 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/CMakeSettings.json @@ -0,0 +1,52 @@ +{ + "configurations": [ + { + "name": "x64-Debug", + "generator": "Ninja", + "configurationType": "Debug", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x64_x64" ], + "variables": [] + }, + { + "name": "x64-Release", + "generator": "Ninja", + "configurationType": "RelWithDebInfo", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x64_x64" ], + "variables": [] + }, + { + "name": "x86-Debug", + "generator": "Ninja", + "configurationType": "Debug", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x86" ], + "variables": [] + }, + { + "name": "x86-Release", + "generator": "Ninja", + "configurationType": "RelWithDebInfo", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x86" ], + "variables": [] + } + ] +} \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt new file mode 100644 index 0000000000..c6e3c10026 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt @@ -0,0 +1,24 @@ +project(ASTP) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/ASTP.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/payload.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt new file mode 100644 index 0000000000..85baaa2c13 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt @@ -0,0 +1,63 @@ +project(ApolloRTCCMFD) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_rtccmfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_launch/rtcc.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/AnalyticEphemerisGenerator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ApolloGeneralizedOpticsProgram.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ApollomfdButtons.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ApolloRTCCMFD.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ApolloRTCCMFD_Display.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ARCore.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ARoapiModule.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/AscentRendezvousMonitor.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/CoastNumericalIntegrator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/CSMLMGuidanceSim.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/EnckeIntegrator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/EntryCalculations.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/GeneralizedIterator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/GeneralPurposeManeuver.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LDPP.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LMGuidanceSim.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LOITargeting.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LunarTargetingProgram.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LWP.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/OrbMech.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ReentryNumericalIntegrator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/RTCC_EMSMISS.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/rtcc_intermediate_library_programs.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/rtcc_library_programs.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/RTCCModule.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/RTCCDisplayFormatting.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLIGuidanceSim.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLIProcessor.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLMCC.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLTrajectoryComputers.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TwoImpulseProcessor.cpp + ${NASSP_SOURCE_ROOT}/src_sys/thread.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/Plugin) +# Workaround for buildbot appending build config name to output path +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${FINAL_INSTALL_DIR}/Modules/Plugin) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + WinMM + WS2_32 +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/CMChute/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/CMChute/CMakeLists.txt new file mode 100644 index 0000000000..689db7cb37 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/CMChute/CMakeLists.txt @@ -0,0 +1,21 @@ +project(CMChute) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_landing + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_landing/CMChute.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Crawler/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Crawler/CMakeLists.txt new file mode 100644 index 0000000000..e0257cde36 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Crawler/CMakeLists.txt @@ -0,0 +1,28 @@ +project(Crawler) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_launch/Crawler.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/EVA/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/EVA/CMakeLists.txt new file mode 100644 index 0000000000..6ed678976f --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/EVA/CMakeLists.txt @@ -0,0 +1,21 @@ +project(EVA) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_csm/eva.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Flag/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Flag/CMakeLists.txt new file mode 100644 index 0000000000..ec060aac38 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Flag/CMakeLists.txt @@ -0,0 +1,19 @@ +project(Flag) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_moon + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_moon/flag.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/FloatBag/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/FloatBag/CMakeLists.txt new file mode 100644 index 0000000000..8e91e35c28 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/FloatBag/CMakeLists.txt @@ -0,0 +1,21 @@ +project(FloatBag) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_landing + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_landing/FloatBag.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Floodlight/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Floodlight/CMakeLists.txt new file mode 100644 index 0000000000..026266713b --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Floodlight/CMakeLists.txt @@ -0,0 +1,26 @@ +project(Floodlight) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_launch/Floodlight.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/LC34/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/LC34/CMakeLists.txt new file mode 100644 index 0000000000..a4828afd7b --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LC34/CMakeLists.txt @@ -0,0 +1,35 @@ +project(LC34) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_launch/IU_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/IUUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_launch/IUUmbilicalInterface.cpp + ${NASSP_SOURCE_ROOT}/src_launch/LC34.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RCA110A.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SCMUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SI_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SIB_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/TailUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/LC37/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/LC37/CMakeLists.txt new file mode 100644 index 0000000000..941b91f555 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LC37/CMakeLists.txt @@ -0,0 +1,36 @@ +project(LC37) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_launch/IU_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/IUUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_launch/IUUmbilicalInterface.cpp + ${NASSP_SOURCE_ROOT}/src_launch/LC37.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RCA110A.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SCMUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SI_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SIB_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/TailUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/LCC/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/LCC/CMakeLists.txt new file mode 100644 index 0000000000..f0d51c1e4a --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LCC/CMakeLists.txt @@ -0,0 +1,26 @@ +project(LCC) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_rtccmfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_launch/LCC.cpp + ${NASSP_SOURCE_ROOT}/src_launch/LCC_MFD.cpp + ${NASSP_SOURCE_ROOT}/src_launch/LCCMFDButtons.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RCA110A.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/LEM/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/LEM/CMakeLists.txt new file mode 100644 index 0000000000..c675bf205f --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LEM/CMakeLists.txt @@ -0,0 +1,111 @@ +# Set the project name +project(LEM) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_lm/yaAGS + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_moon + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/animations.cpp + ${NASSP_SOURCE_ROOT}/src_aux/BasicExcelVC6.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CDK.cpp + ${NASSP_SOURCE_ROOT}/src_aux/Mission.cpp + ${NASSP_SOURCE_ROOT}/src_aux/OrbiterMath.cpp + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_aux/vesim.cpp + ${NASSP_SOURCE_ROOT}/src_lm/CWEA_FlipFlop.cpp + ${NASSP_SOURCE_ROOT}/src_lm/LEM.cpp + ${NASSP_SOURCE_ROOT}/src_lm/LEMcomputer.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lemconnector.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lemmesh.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lempanel.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lemswitches.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lemsystems.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lemvc.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_aca.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_aeaa.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_ags.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_aps.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_cwea.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_dps.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_ecs.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_eds.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_eps.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_lr.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_programer.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_rcs.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_rr.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_scea.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_telecom.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_ttca.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lmscs.cpp + ${NASSP_SOURCE_ROOT}/src_lm/LMMalfunctionSimulation.cpp + ${NASSP_SOURCE_ROOT}/src_lm/yaAGS/aea_engine.c + ${NASSP_SOURCE_ROOT}/src_lm/yaAGS/aea_engine_init.c + ${NASSP_SOURCE_ROOT}/src_lm/yaAGS/OutputAPI_AGS.c + ${NASSP_SOURCE_ROOT}/src_mfd/MFDconnector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/apolloguidance.cpp + ${NASSP_SOURCE_ROOT}/src_sys/cautionwarning.cpp + ${NASSP_SOURCE_ROOT}/src_sys/cdu.cpp + ${NASSP_SOURCE_ROOT}/src_sys/checklistController.cpp + ${NASSP_SOURCE_ROOT}/src_sys/checklistControllerHelpers.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/DelayTimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/dsky.cpp + ${NASSP_SOURCE_ROOT}/src_sys/dskyinterface.cpp + ${NASSP_SOURCE_ROOT}/src_sys/FDAI.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imu.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imulog.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imumath.cpp + ${NASSP_SOURCE_ROOT}/src_sys/inertial.cpp + ${NASSP_SOURCE_ROOT}/src_sys/Malfunction.cpp + ${NASSP_SOURCE_ROOT}/src_sys/MalfunctionSimulation.cpp + ${NASSP_SOURCE_ROOT}/src_sys/mechanicalaccelerometer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/missiontimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/ordeal.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundevents.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp + ${NASSP_SOURCE_ROOT}/src_sys/payload.cpp + ${NASSP_SOURCE_ROOT}/src_sys/powersource.cpp + ${NASSP_SOURCE_ROOT}/src_sys/pyro.cpp + ${NASSP_SOURCE_ROOT}/src_sys/thread.cpp + ${NASSP_SOURCE_ROOT}/src_sys/toggleswitch.cpp + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_engine.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_engine_init.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_utilities.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/Backtrace.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/random.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/rfopen.c +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_sources(LEM PRIVATE ${NASSP_SOURCE_ROOT}/src_lm/LEMResources.rc) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + GLU32 + dxguid + dinput8 + OpenGL32 + User32 + WinMM + WS2_32 + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/LES/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/LES/CMakeLists.txt new file mode 100644 index 0000000000..4e74318d07 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LES/CMakeLists.txt @@ -0,0 +1,20 @@ +project(LES) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/LES.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/LEVA/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/LEVA/CMakeLists.txt new file mode 100644 index 0000000000..6bcfbbe100 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LEVA/CMakeLists.txt @@ -0,0 +1,30 @@ +project(LEVA) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_moon + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/CDK.cpp + ${NASSP_SOURCE_ROOT}/src_aux/OrbiterMath.cpp + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_moon/leva.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/LRV/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/LRV/CMakeLists.txt new file mode 100644 index 0000000000..d920010c95 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LRV/CMakeLists.txt @@ -0,0 +1,30 @@ +project(LRV) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_moon + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/CDK.cpp + ${NASSP_SOURCE_ROOT}/src_aux/OrbiterMath.cpp + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_moon/lrv.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt new file mode 100644 index 0000000000..50accd11c7 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt @@ -0,0 +1,79 @@ +project(MCC) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_rtccmfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/Mission.cpp + ${NASSP_SOURCE_ROOT}/src_launch/mcc.cpp + ${NASSP_SOURCE_ROOT}/src_launch/mccvc.cpp + ${NASSP_SOURCE_ROOT}/src_launch/mccvessel.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Calculations.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_B.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_C.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_C_PRIME.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_D.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_F.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_G.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_H1.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_SL.cpp + ${NASSP_SOURCE_ROOT}/src_launch/rtcc.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_Calculations.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_B.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_C.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_C_PRIME.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_D.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_F.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_G.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_H1.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_SL.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/AnalyticEphemerisGenerator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ApolloGeneralizedOpticsProgram.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/AscentRendezvousMonitor.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/CoastNumericalIntegrator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/CSMLMGuidanceSim.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/EnckeIntegrator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/EntryCalculations.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/GeneralizedIterator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/GeneralPurposeManeuver.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LDPP.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LMGuidanceSim.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LOITargeting.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LunarTargetingProgram.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LWP.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/OrbMech.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ReentryNumericalIntegrator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/RTCC_EMSMISS.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/RTCCDisplayFormatting.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/rtcc_intermediate_library_programs.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/rtcc_library_programs.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/RTCCModule.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLIGuidanceSim.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLIProcessor.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLMCC.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLTrajectoryComputers.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TwoImpulseProcessor.cpp + ${NASSP_SOURCE_ROOT}/src_sys/thread.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/ProjectApollo) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${FINAL_INSTALL_DIR}/Modules/ProjectApollo) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + WinMM + WS2_32 +) diff --git a/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt new file mode 100644 index 0000000000..1b9c7c129b --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt @@ -0,0 +1,38 @@ +project(ML) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_launch/IU_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/IUUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_launch/IUUmbilicalInterface.cpp + ${NASSP_SOURCE_ROOT}/src_launch/ML.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RCA110A.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SCMUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SI_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SIB_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SIC_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/TailUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_launch/TSMUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/MSS/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/MSS/CMakeLists.txt new file mode 100644 index 0000000000..9a65a1b23e --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/MSS/CMakeLists.txt @@ -0,0 +1,28 @@ +project(MSS) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MSS.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/PanelSDK/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/PanelSDK/CMakeLists.txt new file mode 100644 index 0000000000..0baefc4799 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/PanelSDK/CMakeLists.txt @@ -0,0 +1,31 @@ +project(PanelSDK) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/PanelSDK.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/BUILD.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Matrix.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Vectors.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/VSMGMT.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals/esysparse.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals/esystems.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals/hsysparse.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals/hsystems.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals/thermal.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} STATIC ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt new file mode 100644 index 0000000000..14b259eb0f --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt @@ -0,0 +1,30 @@ +project(ProjectApolloConfigurator) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_aux/ProjectApolloConfigurator + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/vesim.cpp + ${NASSP_SOURCE_ROOT}/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/Startup) +# Workaround for buildbot appending build config name to output path +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${FINAL_INSTALL_DIR}/Modules/Startup) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_sources(ProjectApolloConfigurator PRIVATE ${NASSP_SOURCE_ROOT}/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.rc) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + dxguid + dinput8 + GLU32 + User32 + Orbiter + Orbitersdk + OpenGL32 +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt new file mode 100644 index 0000000000..c6e2551a4e --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt @@ -0,0 +1,39 @@ +project(ProjectApolloMFD) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_rtccmfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_mfd/MFDConnector.cpp + ${NASSP_SOURCE_ROOT}/src_mfd/ProjectApolloChecklistMFD.cpp + ${NASSP_SOURCE_ROOT}/src_mfd/ProjectApolloMFD.cpp + ${NASSP_SOURCE_ROOT}/src_mfd/ProjectApolloMFDButtons.cpp + ${NASSP_SOURCE_ROOT}/src_mfd/ProjectApolloPlugin.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/OrbMech.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/Plugin) +# Workaround for buildbot appending build config name to output path +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${FINAL_INSTALL_DIR}/Modules/Plugin) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_sources(ProjectApolloMFD PRIVATE ${NASSP_SOURCE_ROOT}/src_mfd/MFDResources.rc) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + User32 + Orbiter + Orbitersdk + WinMM + WS2_32 +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/SIVB/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/SIVB/CMakeLists.txt new file mode 100644 index 0000000000..7c1b78937e --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/SIVB/CMakeLists.txt @@ -0,0 +1,47 @@ +project(SIVB) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_rtccmfd/OrbMech.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/dcs.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/eds.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/FCC.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/iu.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUAuxiliaryPowerDistributor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUControlDistributor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUControlSignalProcessor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/LVDA.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/LVDC.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/lvimu.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/sivb.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/sivbsystems.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/DelayTimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/inertial.cpp + ${NASSP_SOURCE_ROOT}/src_sys/powersource.cpp + ${NASSP_SOURCE_ROOT}/src_sys/pyro.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort1/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort1/CMakeLists.txt new file mode 100644 index 0000000000..3359998979 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort1/CMakeLists.txt @@ -0,0 +1,29 @@ +project(Sat1bAbort1) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/Saturn1Abort.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort2/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort2/CMakeLists.txt new file mode 100644 index 0000000000..6eb7a974ff --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort2/CMakeLists.txt @@ -0,0 +1,29 @@ +project(Sat1bAbort2) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/Saturn1Abort2.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort1/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort1/CMakeLists.txt new file mode 100644 index 0000000000..48b15f1aca --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort1/CMakeLists.txt @@ -0,0 +1,29 @@ +project(Sat5Abort1) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/Sat5Abort1.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort2/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort2/CMakeLists.txt new file mode 100644 index 0000000000..51430e0d21 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort2/CMakeLists.txt @@ -0,0 +1,29 @@ +project(Sat5Abort2) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/Sat5Abort2.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort3/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort3/CMakeLists.txt new file mode 100644 index 0000000000..478d759e86 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort3/CMakeLists.txt @@ -0,0 +1,31 @@ +project(Sat5Abort3) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_csm/smjc.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/Sat5Abort3.cpp + ${NASSP_SOURCE_ROOT}/src_sys/DelayTimer.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Sat5LMDSC/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Sat5LMDSC/CMakeLists.txt new file mode 100644 index 0000000000..9c3f09bb85 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5LMDSC/CMakeLists.txt @@ -0,0 +1,31 @@ +project(Sat5LMDSC) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/Mission.cpp + ${NASSP_SOURCE_ROOT}/src_lm/Sat5LMDSC.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt new file mode 100644 index 0000000000..bdf134ffbb --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt @@ -0,0 +1,132 @@ +# Set the project name +project(Saturn1B) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_landing + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_moon + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/animations.cpp + ${NASSP_SOURCE_ROOT}/src_aux/BasicExcelVC6.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CDK.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CueCard.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CueCardLocation.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CueCardManager.cpp + ${NASSP_SOURCE_ROOT}/src_aux/Mission.cpp + ${NASSP_SOURCE_ROOT}/src_aux/OrbiterMath.cpp + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_aux/vesim.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csm_telecom.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmcautionwarning.cpp + ${NASSP_SOURCE_ROOT}/src_csm/CSMcomputer.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmconnector.cpp + ${NASSP_SOURCE_ROOT}/src_csm/CSMMalfunctionSimulation.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmrcs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmsensors.cpp + ${NASSP_SOURCE_ROOT}/src_csm/dockingprobe.cpp + ${NASSP_SOURCE_ROOT}/src_csm/ecs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/eps.cpp + ${NASSP_SOURCE_ROOT}/src_csm/rhc.cpp + ${NASSP_SOURCE_ROOT}/src_csm/sce.cpp + ${NASSP_SOURCE_ROOT}/src_csm/scs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturn.cpp + ${NASSP_SOURCE_ROOT}/src_csm/satswitches.cpp + ${NASSP_SOURCE_ROOT}/src_csm/satsystems.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturnmesh.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturnpanel.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturnvc.cpp + ${NASSP_SOURCE_ROOT}/src_csm/secs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/smjc.cpp + ${NASSP_SOURCE_ROOT}/src_csm/sps.cpp + ${NASSP_SOURCE_ROOT}/src_mfd/MFDconnector.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/OrbMech.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/saturn1b.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/canard.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/dcs.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/eds.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/FCC.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/iu.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUAuxiliaryPowerDistributor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUControlDistributor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUControlSignalProcessor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/j2engine.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/LVDA.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/LVDC.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/lvimu.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/qball.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/s1bsystems.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/sat1bmesh.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/siisystems.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/sivbsystems.cpp + ${NASSP_SOURCE_ROOT}/src_sys/apolloguidance.cpp + ${NASSP_SOURCE_ROOT}/src_sys/cautionwarning.cpp + ${NASSP_SOURCE_ROOT}/src_sys/cdu.cpp + ${NASSP_SOURCE_ROOT}/src_sys/checklistController.cpp + ${NASSP_SOURCE_ROOT}/src_sys/checklistControllerHelpers.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/DelayTimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/dsky.cpp + ${NASSP_SOURCE_ROOT}/src_sys/dskyinterface.cpp + ${NASSP_SOURCE_ROOT}/src_sys/FDAI.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imu.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imulog.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imumath.cpp + ${NASSP_SOURCE_ROOT}/src_sys/inertial.cpp + ${NASSP_SOURCE_ROOT}/src_sys/Malfunction.cpp + ${NASSP_SOURCE_ROOT}/src_sys/MalfunctionSimulation.cpp + ${NASSP_SOURCE_ROOT}/src_sys/mechanicalaccelerometer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/missiontimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/ordeal.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundevents.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp + ${NASSP_SOURCE_ROOT}/src_sys/payload.cpp + ${NASSP_SOURCE_ROOT}/src_sys/powersource.cpp + ${NASSP_SOURCE_ROOT}/src_sys/pyro.cpp + ${NASSP_SOURCE_ROOT}/src_sys/thread.cpp + ${NASSP_SOURCE_ROOT}/src_sys/toggleswitch.cpp + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_engine.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_engine_init.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_utilities.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/Backtrace.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/random.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/rfopen.c +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/lib/Lua) +link_directories(${ORBITERSDK_DIR}/..) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_sources(Saturn1B PRIVATE ${NASSP_SOURCE_ROOT}/src_csm/Resources.rc) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + GLU32 + dxguid + dinput8 + OpenGL32 + User32 + WinMM + WS2_32 + Orbiter + Orbitersdk + PanelSDK + XRSound +) +if(OPENORBITER) + target_link_libraries(${PROJECT_NAME} PRIVATE lua) +else() + target_link_libraries(${PROJECT_NAME} PRIVATE lua5.1) +endif() \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt new file mode 100644 index 0000000000..2e99558f4b --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt @@ -0,0 +1,131 @@ +project(Saturn5) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_landing + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_moon + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/animations.cpp + ${NASSP_SOURCE_ROOT}/src_aux/BasicExcelVC6.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CDK.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CueCard.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CueCardLocation.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CueCardManager.cpp + ${NASSP_SOURCE_ROOT}/src_aux/Mission.cpp + ${NASSP_SOURCE_ROOT}/src_aux/OrbiterMath.cpp + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_aux/vesim.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csm_telecom.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmcautionwarning.cpp + ${NASSP_SOURCE_ROOT}/src_csm/CSMcomputer.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmconnector.cpp + ${NASSP_SOURCE_ROOT}/src_csm/CSMMalfunctionSimulation.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmrcs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmsensors.cpp + ${NASSP_SOURCE_ROOT}/src_csm/dockingprobe.cpp + ${NASSP_SOURCE_ROOT}/src_csm/ecs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/eps.cpp + ${NASSP_SOURCE_ROOT}/src_csm/rhc.cpp + ${NASSP_SOURCE_ROOT}/src_csm/sce.cpp + ${NASSP_SOURCE_ROOT}/src_csm/scs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturn.cpp + ${NASSP_SOURCE_ROOT}/src_csm/satswitches.cpp + ${NASSP_SOURCE_ROOT}/src_csm/satsystems.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturnmesh.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturnpanel.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturnvc.cpp + ${NASSP_SOURCE_ROOT}/src_csm/secs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/smjc.cpp + ${NASSP_SOURCE_ROOT}/src_csm/sps.cpp + ${NASSP_SOURCE_ROOT}/src_mfd/MFDconnector.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/OrbMech.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/saturn5.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/canard.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/dcs.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/eds.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/FCC.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/iu.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUAuxiliaryPowerDistributor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUControlDistributor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUControlSignalProcessor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/j2engine.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/LVDA.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/LVDC.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/lvimu.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/qball.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/s1csystems.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/sat5mesh.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/siisystems.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/sivbsystems.cpp + ${NASSP_SOURCE_ROOT}/src_sys/apolloguidance.cpp + ${NASSP_SOURCE_ROOT}/src_sys/cautionwarning.cpp + ${NASSP_SOURCE_ROOT}/src_sys/cdu.cpp + ${NASSP_SOURCE_ROOT}/src_sys/checklistController.cpp + ${NASSP_SOURCE_ROOT}/src_sys/checklistControllerHelpers.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/DelayTimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/dsky.cpp + ${NASSP_SOURCE_ROOT}/src_sys/dskyinterface.cpp + ${NASSP_SOURCE_ROOT}/src_sys/FDAI.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imu.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imulog.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imumath.cpp + ${NASSP_SOURCE_ROOT}/src_sys/inertial.cpp + ${NASSP_SOURCE_ROOT}/src_sys/Malfunction.cpp + ${NASSP_SOURCE_ROOT}/src_sys/MalfunctionSimulation.cpp + ${NASSP_SOURCE_ROOT}/src_sys/mechanicalaccelerometer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/missiontimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/ordeal.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundevents.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp + ${NASSP_SOURCE_ROOT}/src_sys/payload.cpp + ${NASSP_SOURCE_ROOT}/src_sys/powersource.cpp + ${NASSP_SOURCE_ROOT}/src_sys/pyro.cpp + ${NASSP_SOURCE_ROOT}/src_sys/thread.cpp + ${NASSP_SOURCE_ROOT}/src_sys/toggleswitch.cpp + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_engine.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_engine_init.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_utilities.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/Backtrace.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/random.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/rfopen.c +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/lib/Lua) +link_directories(${ORBITERSDK_DIR}/..) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_sources(Saturn5 PRIVATE ${NASSP_SOURCE_ROOT}/src_csm/Resources.rc) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + GLU32 + dxguid + dinput8 + OpenGL32 + User32 + WinMM + WS2_32 + Orbiter + Orbitersdk + PanelSDK + XRSound +) +if(OPENORBITER) + target_link_libraries(${PROJECT_NAME} PRIVATE lua) +else() + target_link_libraries(${PROJECT_NAME} PRIVATE lua5.1) +endif() \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Skylab/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Skylab/CMakeLists.txt new file mode 100644 index 0000000000..4251bd1f3e --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Skylab/CMakeLists.txt @@ -0,0 +1,36 @@ +project(Skylab) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_skylab + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_skylab/ATMDC.cpp + ${NASSP_SOURCE_ROOT}/src_skylab/skylab.cpp + ${NASSP_SOURCE_ROOT}/src_skylab/SkylabConnector.cpp + ${NASSP_SOURCE_ROOT}/src_skylab/SkylabMesh.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/powersource.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/VAB/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/VAB/CMakeLists.txt new file mode 100644 index 0000000000..906e4d7711 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/VAB/CMakeLists.txt @@ -0,0 +1,29 @@ +project(VAB) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_launch/VAB.cpp + ${NASSP_SOURCE_ROOT}/src_launch/VABAnimations.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/s1b/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/s1b/CMakeLists.txt new file mode 100644 index 0000000000..c6d9b3d080 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/s1b/CMakeLists.txt @@ -0,0 +1,33 @@ +project(s1b) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/s1b.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/s1bsystems.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/pyro.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/s1c/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/s1c/CMakeLists.txt new file mode 100644 index 0000000000..e75e73d10d --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/s1c/CMakeLists.txt @@ -0,0 +1,32 @@ +project(s1c) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/s1c.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/pyro.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/sii/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/sii/CMakeLists.txt new file mode 100644 index 0000000000..ff901f7033 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/sii/CMakeLists.txt @@ -0,0 +1,29 @@ +project(sii) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/sii.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/sm/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/sm/CMakeLists.txt new file mode 100644 index 0000000000..2223762531 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/sm/CMakeLists.txt @@ -0,0 +1,29 @@ +project(sm) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_csm/smjc.cpp + ${NASSP_SOURCE_ROOT}/src_csm/sm.cpp + ${NASSP_SOURCE_ROOT}/src_sys/DelayTimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp index ac756e6a04..1e07d4ab2a 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp @@ -33,6 +33,7 @@ #include "resource.h" #include #include "vesim.h" +#include // ============================================================== // Some global parameters @@ -89,9 +90,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 +228,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 +433,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 +454,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]; @@ -547,7 +548,7 @@ BOOL CALLBACK ProjectApolloConfigurator::DlgProcControl (HWND hWnd, UINT uMsg, W } 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) GetWindowLongPtr(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); @@ -572,7 +573,7 @@ BOOL CALLBACK ProjectApolloConfigurator::DlgProcControl (HWND hWnd, UINT uMsg, W // set the text color in (HDC)lParam SetBkMode((HDC)wParam,TRANSPARENT); SetTextColor((HDC)wParam, RGB(255,0,0)); - return (BOOL)CreateSolidBrush(GetSysColor(COLOR_BTNFACE)); + return (INT_PTR)CreateSolidBrush(GetSysColor(COLOR_BTNFACE)); } break; } diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/dinput8.lib b/Orbitersdk/samples/ProjectApollo/src_aux/dinput8.lib deleted file mode 100644 index 3fad62fbd1..0000000000 Binary files a/Orbitersdk/samples/ProjectApollo/src_aux/dinput8.lib and /dev/null differ diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/dsound.lib b/Orbitersdk/samples/ProjectApollo/src_aux/dsound.lib deleted file mode 100644 index 37bf188bc4..0000000000 Binary files a/Orbitersdk/samples/ProjectApollo/src_aux/dsound.lib and /dev/null differ diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/dxguid.lib b/Orbitersdk/samples/ProjectApollo/src_aux/dxguid.lib deleted file mode 100644 index f251a925fe..0000000000 Binary files a/Orbitersdk/samples/ProjectApollo/src_aux/dxguid.lib and /dev/null differ diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp index 1a3eb530bf..ab2b846d3d 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp @@ -2929,7 +2929,7 @@ void Saturn::GetScenarioState (FILEHANDLE scn, void *vstatus) // find. // - srandom(VehicleNo + (int) vstatus + (int) time(0)); + srandom(VehicleNo + (size_t) vstatus + (int) time(0)); // // At some point we should reorder these checks by length, to minimise the chances diff --git a/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.cpp b/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.cpp index 6b90f276e8..63a463ba48 100644 --- a/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.cpp @@ -38,12 +38,12 @@ 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) { case OAPI_MSG_MFD_OPENED: - return (int)(new LCC_MFD(LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam)); + return (OAPI_MSGTYPE)(new LCC_MFD(LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam)); } return 0; } diff --git a/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h b/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h index 5eb2896421..135e326cdc 100644 --- a/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h +++ b/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h @@ -28,6 +28,11 @@ #include "LCC.h" #include "LCCMFDButtons.h" + +#ifndef OAPI_MSGTYPE +typedef int OAPI_MSGTYPE; +#endif + class LCC_MFD :public MFD2 { private: @@ -50,7 +55,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_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..dd245cb487 100644 --- a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.h +++ b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.h @@ -27,6 +27,10 @@ class MCC; +#ifndef OAPI_MSGTYPE +typedef int OAPI_MSGTYPE; +#endif + class ProjectApolloChecklistMFD: public MFD2 { public: ProjectApolloChecklistMFD (DWORD w, DWORD h, VESSEL *vessel); @@ -42,7 +46,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 1e78a226cd..880bc495c3 100644 --- a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.cpp @@ -2839,13 +2839,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 6d7c48416a..5ebe96d1ba 100644 --- a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.h +++ b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.h @@ -34,6 +34,10 @@ class MCC; class SIVB; class Skylab; +#ifndef OAPI_MSGTYPE +typedef int OAPI_MSGTYPE; +#endif + /// /// \ingroup MFD /// @@ -128,7 +132,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..141d5bb5df 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..01449b1dc9 100644 --- a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.h +++ b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.h @@ -26,6 +26,10 @@ See http://nassp.sourceforge.net/license/ for more details. #include "Orbitersdk.h" +#ifndef OAPI_MSGTYPE +typedef int OAPI_MSGTYPE; +#endif + class ARoapiModule : public oapi::Module { public: ARoapiModule(HINSTANCE hDLL); @@ -35,6 +39,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/EnckeIntegrator.cpp b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/EnckeIntegrator.cpp index 794b8c9691..f8b132a263 100644 --- a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/EnckeIntegrator.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/EnckeIntegrator.cpp @@ -132,7 +132,7 @@ void EnckeFreeFlightIntegrator::Propagate(EMMENIInputTable &in) } else if (ISTOPS == 4 || ISTOPS == 6 || ISTOPS == 7 || ISTOPS == 8) { - //0.0001° tolerance + //0.0001� tolerance DEV = 0.0001*RAD; } else diff --git a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/RTCCSystemParameters.h b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/RTCCSystemParameters.h index 6395ae267b..59ffd76f23 100644 --- a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/RTCCSystemParameters.h +++ b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/RTCCSystemParameters.h @@ -247,12 +247,12 @@ struct RTCCSystemParameters MDCMAT[5] = -5.1257e-7; MDCMAT[6] = 7.739e-8; MDCMAT[7] = 5.7700e-8; MDCMAT[8] = -3.4567e-9; MDSMAT[0] = -4.1312e-9; MDSMAT[1] = -8.9613e-7; MDSMAT[2] = 2.6809e-7; MDSMAT[3] = -2.15567e-8; MDSMAT[4] = 1.9885e-7; MDSMAT[5] = -4.4095e-7; MDSMAT[6] = 1.497e-7; MDSMAT[7] = -1.2389e-8; MDSMAT[8] = 6.4464e-9; - MGTESE = 0; //4 to use the full tesseral data. Use 0 in Orbiter Beta and earlier, 4 in Open Orbiter + MGTESE = 4; //4 to use the full tesseral data. Use 0 in Orbiter Beta and earlier, 4 in Open Orbiter //Moon MMCMAT[0] = 0.0; MMCMAT[1] = 0.20715e-4; MMCMAT[2] = 0.34e-4; MMCMAT[3] = 0.0; MMCMAT[4] = 0.02583e-4; MMCMAT[5] = 0.0; MMCMAT[6] = 0.0; MMCMAT[7] = 0.0; MMCMAT[8] = 0.0; MMSMAT[0] = 0.0; MMSMAT[1] = 0.0; MMSMAT[2] = 0.0; MMSMAT[3] = 0.0; MMSMAT[4] = 0.0; MMSMAT[5] = 0.0; MMSMAT[6] = 0.0; MMSMAT[7] = 0.0; MMSMAT[8] = 0.0; - MMTESE = 0; //3 with L1 model. Use 0 in Orbiter Beta and earlier, 3 in Open Orbiter + MMTESE = 3; //3 with L1 model. Use 0 in Orbiter Beta and earlier, 3 in Open Orbiter //Time from launch to EOI, seconds MDLIEV[0] = 0.76673814e3; diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/PanelSDK/Internals/Hsysparse.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/PanelSDK/Internals/Hsysparse.cpp index ebfb3b3cda..521fdf7cbb 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/PanelSDK/Internals/Hsysparse.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/PanelSDK/Internals/Hsysparse.cpp @@ -551,7 +551,7 @@ void H_system::Create_h_ExteriorVentPipe(char* line) { if (!out) { char errorBuffer[255]; sprintf_s(errorBuffer, sizeof(errorBuffer), "Fatal Error, could not connect %s to EXTERIOR_ENVIRONMENT:IN", name); - oapiWriteLogError(errorBuffer); + oapiWriteLogError(errorBuffer, "%s"); } int two_way = 1; diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.cpp index c303183cc6..71dbf6a467 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.cpp @@ -744,61 +744,6 @@ int SoundEvent::LoadMissionTimeSoundArray(const SoundLib &soundlib, char *soundn return true; } -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); -} - int SoundEvent::PlaySound(char *filenames,int newbuffer, double offset) { HMMIO m_hmmio; diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.h b/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.h index d1fa3b7c23..43f6f41713 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.h +++ b/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.h @@ -64,7 +64,6 @@ class SoundEvent { int Done(); int LoadMissionLandingSoundArray(const SoundLib &soundlib,char *soundname); int LoadMissionTimeSoundArray(const SoundLib &soundlib, char *soundname, double MissionTime); - int InitDirectSound(); int PlaySound(char *filenames,int newbuffer,double offset); int IsPlaying(); int Finish(double offsetfinish); diff --git a/README.md b/README.md index 147769c2f7..6cd744d75e 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ or accessible simulation there are plenty of better options, both for Orbiter and for other platforms. Orbiter is a Windows program, so this is a Windows-based project. You -will need Microsoft Visual Studio 2017 (or newer) to build the project. +will need Microsoft Visual Studio 2019/2022 (or newer) to build the project. Until someone ports Orbiter to other platforms (or produces an Orbiter-compatible simulator of sufficient capability) there's not much that can be done about this. Orbiter and NASSP might run under WINE, diff --git a/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn index db42de07f9..e7c7e8ed90 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 98e7053e7f..ea9187538a 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 @@ -713,8 +713,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 27a2feaea8..208b956602 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 @@ -579,8 +579,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/Broken Scenarios/Apollo - Historical Missions/Apollo 4 - Launch.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Apollo - Historical Missions/Apollo 4 - Launch.scn index ba51306c55..61c156610e 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Apollo - Historical Missions/Apollo 4 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Apollo - Historical Missions/Apollo 4 - Launch.scn @@ -3,7 +3,7 @@ The Saturn V makes its first flight to test itself and carry an unmanned CSM int END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 39803.5000115741 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Apollo - Historical Missions/Apollo 6 - Launch.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Apollo - Historical Missions/Apollo 6 - Launch.scn index 3c456af408..1cb50befbe 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Apollo - Historical Missions/Apollo 6 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Apollo - Historical Missions/Apollo 6 - Launch.scn @@ -3,7 +3,7 @@ The Saturn V makes its second flight to test itself and carry an unmanned CSM/LM END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 39950.5000115741 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-1a Earth Resources mission.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-1a Earth Resources mission.scn index 650416ccc4..4170e97251 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-1a Earth Resources mission.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-1a Earth Resources mission.scn @@ -3,7 +3,7 @@ AAP - Mission 1a. CDR:Donald R. Garrett, CMP:Joel M. Rosenweig, LMP:Neil B. Ande END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 40312.5838078704 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn 1B - Launch.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn 1B - Launch.scn index ba5f2dea05..63a30e9f96 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn 1B - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn 1B - Launch.scn @@ -3,7 +3,7 @@ AAP - Saturn 1B - Launch. Testing scenario in which a Saturn 1b launches a CSM i END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 41951.543565 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn V - Launch.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn V - Launch.scn index fae9b900fc..0c881a9119 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn V - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn V - Launch.scn @@ -3,7 +3,7 @@ AAP - Saturn V - Launch. After launch you will find yourself in a 185.2km 185.2 END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 41951.543565 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo to Venus Orbital Test.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo to Venus Orbital Test.scn index 39fdb31d95..b13271e6f6 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo to Venus Orbital Test.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo to Venus Orbital Test.scn @@ -6,7 +6,7 @@ Be prepared for random failures during the launch and flight. END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 40995.52222222 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Manned Venus Flyby/Test flight approaching orbit-raising burn.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Manned Venus Flyby/Test flight approaching orbit-raising burn.scn index 2e8b782406..f9fbfb855b 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Manned Venus Flyby/Test flight approaching orbit-raising burn.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Manned Venus Flyby/Test flight approaching orbit-raising burn.scn @@ -6,7 +6,7 @@ After the burn, use Prog 59 in the AGC to vent remaining propellant from the SIV END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 40995.6700611447 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Moonlab.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Moonlab.scn index 20080d3831..4c9f593f4f 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Moonlab.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Moonlab.scn @@ -3,7 +3,7 @@ Moonlab. Mission to set up a Lunar Orbiting Spacestation. First flight objective END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 40483.40103032411 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Random Failures Test Launch.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Random Failures Test Launch.scn index 97285021f0..6b5ad7dfc2 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Random Failures Test Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Random Failures Test Launch.scn @@ -3,7 +3,7 @@ Test out the random failures with this mission. Odds are about one in ten of som END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 40418.52222222 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Reference Missions/DRM-64.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Reference Missions/DRM-64.scn index 4fb6d78bb8..138f68cba3 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Reference Missions/DRM-64.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Reference Missions/DRM-64.scn @@ -6,7 +6,7 @@ TLI occurs at GET 02:46:44. LOI occurs around GET 69:17:53. END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 39982.7305557871 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 1b Skylab.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 1b Skylab.scn index 0182bb63a5..85917a01cb 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 1b Skylab.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 1b Skylab.scn @@ -3,7 +3,7 @@ Test of early Skylab plans using a Saturn 1b to launch a 'wet workshop' and crew END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 40995.52222222 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 5 INT 20 launch.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 5 INT 20 launch.scn index 8a0b1b150a..3ff432e74e 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 5 INT 20 launch.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 5 INT 20 launch.scn @@ -3,7 +3,7 @@ Fly the planned Saturn 5 - INT 20 derivative to orbit. Be prepared for random fa END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 40418.52222222 END_ENVIRONMENT 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 a3c260247d..649b2caabe 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 @@ -61,8 +61,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 @@ -563,8 +563,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 9e16c08fb8..b4605716d6 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch.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 @@ -567,8 +567,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.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 14 - Launch.scn index 78b596f995..fa27006bb4 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 14 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 14 - Launch.scn @@ -62,8 +62,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 @@ -628,8 +628,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 be75050832..f5a64f7780 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 15 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 15 - Launch.scn @@ -62,8 +62,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 @@ -546,8 +546,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 91a3adff60..aa8894c921 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 16 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 16 - Launch.scn @@ -78,8 +78,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 @@ -559,8 +559,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.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 17 - Launch.scn index 7030ca3051..d599a0bfe6 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 17 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 17 - Launch.scn @@ -77,8 +77,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 @@ -624,8 +624,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/appveyor.yml b/appveyor.yml deleted file mode 100644 index cc0b456fbc..0000000000 --- a/appveyor.yml +++ /dev/null @@ -1,46 +0,0 @@ -version: 8.0-Beta-{branch}-{build} -skip_tags: true -os: Visual Studio 2017 -configuration: Release -platform: Win32 -before_build: -- appveyor DownloadFile http://cirno.lunar-tokyo.net/PA-Items-%APPVEYOR_REPO_BRANCH%.zip -- 7z x PA-Items-%APPVEYOR_REPO_BRANCH%.zip -- del PA-Items-%APPVEYOR_REPO_BRANCH%.zip -build: - verbosity: normal -after_build: -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Config\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Doc\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Html\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Meshes\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Missions\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Modules\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Scenarios\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Script\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Sound\ -xr!OrbiterSound_SDK -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Textures\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\NASSP-LICENSE.txt -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\README.md -- 7z a NASSP-XRSound-Config-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\XRSound\ -artifacts: -- path: NASSP-V$(appveyor_build_version).zip - name: NASSP -- path: NASSP-XRSound-Config-V$(appveyor_build_version).zip - name: NASSP-XRSound-Config -deploy: -- provider: GitHub - tag: NASSP-V$(appveyor_build_version) - description: V8.0 Beta Release - auth_token: - secure: IQ7NMbd0zOFrOgF1Kmp2i5/6C/bTng4X83G4tu9YAoYViKEvjWTPcn7r/0kKJ7M2 - artifact: NASSP,NASSP-XRSound-Config - prerelease: true -notifications: - - provider: Webhook - url: http://cirno.lunar-tokyo.net/NASSP/web-hook.php - headers: - Authorization: - secure: dbYgsSP4RjFtMPSa95EaBA== - on_build_success: true - on_build_failure: true