Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
7cfe900
Restart OO development from scratch with CMake
CaptainSwag101 Jun 30, 2024
9cdab42
Add remaining projects
CaptainSwag101 Jun 30, 2024
f1b3188
Fix MCC vessel build output location
CaptainSwag101 Jun 30, 2024
f6c9e4d
Add compatibility with Orbiter Beta R90
CaptainSwag101 Jul 1, 2024
58c928b
Delete CMakeSettings.json
CaptainSwag101 Jul 1, 2024
662c187
Add new default CMakeSettings.json
CaptainSwag101 Jul 1, 2024
9bfc73e
Ignore further changes to CMakeSettings.json
CaptainSwag101 Jul 1, 2024
feaafdb
More gitignore changes
CaptainSwag101 Jul 1, 2024
8bcb00c
Un-hardcode project name into linking details
CaptainSwag101 Jul 23, 2024
ec361c0
Add new Ascent/Rendezvous Monitor source files to projects
CaptainSwag101 Jul 23, 2024
e887853
Add new setting for final output directory for special installations
CaptainSwag101 Jul 23, 2024
072f474
Configure config/data file auto-copying
CaptainSwag101 Jul 31, 2024
12678b6
Add extra check for final dir == repo root before copying
CaptainSwag101 Jul 31, 2024
cce0a4d
Clarify copy variable name, fix NASSP-inside-Orbiter-dir detection
CaptainSwag101 Aug 1, 2024
06aabc4
Reorganize main CMakeLists file
CaptainSwag101 Aug 1, 2024
43c0a0c
Message the final install dir when copying
CaptainSwag101 Aug 6, 2024
1a789f4
Consolidate target_link_libraries() statements in projects
CaptainSwag101 Aug 9, 2024
79d158b
Vastly simplify install step, only copy data files when explicitly ru…
CaptainSwag101 Aug 9, 2024
6997477
Enable auto-detection of OpenOrbiter, optimize install step slightly
CaptainSwag101 Aug 9, 2024
81df97f
Move MSVC compiler settings to after OpenOrbiter flag definition
CaptainSwag101 Aug 9, 2024
c8a3237
Fix arrangement of Orbiter install dir and final install dir variables
CaptainSwag101 Aug 9, 2024
01d2cf1
Actually fix variable ordering this time
CaptainSwag101 Aug 19, 2024
c09452c
Copy Missions folder during Install step
CaptainSwag101 Sep 12, 2024
a767895
Fix oapiWriteLogError macro usage in Hsysparse
CaptainSwag101 Sep 25, 2024
7e96749
Add Mission source to MCC project
CaptainSwag101 Nov 5, 2024
10a2805
Enable new lunar gravity model & RTCC support for it
CaptainSwag101 Jan 1, 2025
9a5a93e
Use R2 padload values for the AGC where applicable
CaptainSwag101 Jan 1, 2025
50e26ee
Enable new Earth gravity model & RTCC support for it
CaptainSwag101 Jan 1, 2025
f02758e
Disable 32-bit-only moons
CaptainSwag101 Jan 1, 2025
eb9084a
Update Moon config to latest visual settings / comments
CaptainSwag101 Jan 2, 2025
851a607
Update Earth config to latest parameters
CaptainSwag101 Jan 2, 2025
e1a4583
Remove legacy Earth.cfg and Sol.cfg files
CaptainSwag101 Jan 2, 2025
c11e202
Fix building with new MCC code
CaptainSwag101 Jan 12, 2025
e9977ee
Add Flag vessel
CaptainSwag101 Jan 14, 2025
d4b250c
Add GH Actions workflow for autobuilding
CaptainSwag101 Feb 21, 2025
9a43fd4
Bump version number to 9.0
CaptainSwag101 Feb 21, 2025
4eef5cf
Remove Appveyor script
CaptainSwag101 Feb 22, 2025
22ec945
Update contributing guideline file for Orbiter 2024
CaptainSwag101 Feb 22, 2025
5cd9d21
Try and cache the Orbiter 2024 x64 zip file for the buildbot
CaptainSwag101 Feb 22, 2025
b27c792
Remove COPYING.txt since OpenOrbiter is free software
CaptainSwag101 Feb 22, 2025
ba21ba6
Remove "beta" from build names, move "x64" to zip filename
CaptainSwag101 Feb 22, 2025
8649a52
Update gitattributes to target the new build script
CaptainSwag101 Feb 22, 2025
f47d1a0
Update VS version recommendation in readme
CaptainSwag101 Feb 22, 2025
4787bf9
Add Two-Impulse Processor code files to RTCC and MCC projects
CaptainSwag101 Apr 10, 2025
78ff8ab
Fix DirectInput on x64
CaptainSwag101 Oct 31, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -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
56 changes: 56 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -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
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 3 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
31 changes: 0 additions & 31 deletions COPYING.txt

This file was deleted.

82 changes: 0 additions & 82 deletions Config/ProjectApollo/Earth.cfg

This file was deleted.

Loading