From 7cfe900a6f1b148903806ae9239981aa3dcc7162 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Sun, 30 Jun 2024 13:58:01 -0700 Subject: [PATCH 01/45] Restart OO development from scratch with CMake I'm aiming for seamless cross-compatibility between Orbiter Beta R90 and OpenOrbiter, let's see if it's possible! --- Orbitersdk/samples/ProjectApollo/.gitignore | 12 ++ .../samples/ProjectApollo/CMakeLists.txt | 60 +++++++++ .../samples/ProjectApollo/CMakeSettings.json | 55 ++++++++ .../ProjectApollo/Project/ASTP/CMakeLists.txt | 22 +++ .../Project/ApolloRTCCMFD/CMakeLists.txt | 56 ++++++++ .../Project/CMChute/CMakeLists.txt | 19 +++ .../Project/Crawler/CMakeLists.txt | 26 ++++ .../ProjectApollo/Project/LEM/CMakeLists.txt | 109 +++++++++++++++ .../Project/PanelSDK/CMakeLists.txt | 29 ++++ .../ProjectApolloConfigurator/CMakeLists.txt | 26 ++++ .../Project/ProjectApolloMFD/CMakeLists.txt | 35 +++++ .../Project/Saturn1B/CMakeLists.txt | 125 ++++++++++++++++++ .../Project/Saturn5/CMakeLists.txt | 124 +++++++++++++++++ .../ProjectApolloConfigurator.cpp | 17 +-- .../samples/ProjectApollo/src_aux/dinput8.lib | Bin 19978 -> 0 bytes .../samples/ProjectApollo/src_aux/dsound.lib | Bin 4042 -> 0 bytes .../samples/ProjectApollo/src_aux/dxguid.lib | Bin 107734 -> 0 bytes .../samples/ProjectApollo/src_csm/saturn.cpp | 2 +- .../src_mfd/ProjectApolloChecklistMFD.cpp | 4 +- .../src_mfd/ProjectApolloChecklistMFD.h | 2 +- .../src_mfd/ProjectApolloMFD.cpp | 4 +- .../ProjectApollo/src_mfd/ProjectApolloMFD.h | 2 +- .../src_rtccmfd/ARoapiModule.cpp | 4 +- .../ProjectApollo/src_rtccmfd/ARoapiModule.h | 2 +- .../ProjectApollo/src_sys/soundevents.cpp | 55 -------- .../ProjectApollo/src_sys/soundevents.h | 1 - 26 files changed, 717 insertions(+), 74 deletions(-) create mode 100644 Orbitersdk/samples/ProjectApollo/.gitignore create mode 100644 Orbitersdk/samples/ProjectApollo/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/CMakeSettings.json create mode 100644 Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/CMChute/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/Crawler/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/LEM/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/PanelSDK/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt delete mode 100644 Orbitersdk/samples/ProjectApollo/src_aux/dinput8.lib delete mode 100644 Orbitersdk/samples/ProjectApollo/src_aux/dsound.lib delete mode 100644 Orbitersdk/samples/ProjectApollo/src_aux/dxguid.lib 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..1991926265 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -0,0 +1,60 @@ +cmake_minimum_required(VERSION 3.19) + +# Set the project name +project(NASSP VERSION 8.0.3) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +#Add /permissive if using C++20 or higher +#add_compile_options(/permissive) + +# Group projects in VS +#set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +# 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 ${CMAKE_SOURCE_DIR}/../../../ CACHE STRING "Location of OpenOrbiter installation directory") + +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() + +if(MSVC) + # Flag pointer truncation as an error because if it happens that's bad news! + add_compile_options(/we4311) + #add_link_options("/NODEFAULTLIB:\"LIBCMTD\"") +endif() + +# Set project-wide variables +set(ORBITERSDK_DIR ${ORBITER_INSTALL_DIR}/Orbitersdk) +set(NASSP_SOURCE_ROOT ${CMAKE_SOURCE_DIR}) + +# Set project libraries to output their DLL files and debug info to +# the Orbiter installation'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 ${ORBITER_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/LEM) +add_subdirectory(Project/ProjectApolloConfigurator) +add_subdirectory(Project/ProjectApolloMFD) +add_subdirectory(Project/Saturn1B) +add_subdirectory(Project/Saturn5) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/CMakeSettings.json b/Orbitersdk/samples/ProjectApollo/CMakeSettings.json new file mode 100644 index 0000000000..67d580ab80 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/CMakeSettings.json @@ -0,0 +1,55 @@ +{ + "configurations": [ + { + "name": "x64-Debug", + "generator": "Ninja", + "configurationType": "Debug", + "inheritEnvironments": [ "msvc_x64_x64" ], + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "variables": [ + { + "name": "ORBITER_INSTALL_DIR", + "value": "C:\\Users\\jpmac\\Desktop\\Games - SSD\\OpenOrbiter\\out\\build\\windows-x64-debug", + "type": "STRING" + } + ] + }, + { + "name": "x64-Release", + "generator": "Ninja", + "configurationType": "RelWithDebInfo", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x64_x64" ] + }, + { + "name": "x86-Debug", + "generator": "Ninja", + "configurationType": "Debug", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x86" ] + }, + { + "name": "x86-Release", + "generator": "Ninja", + "configurationType": "RelWithDebInfo", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x86" ] + } + ] +} \ 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..49f6be530d --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt @@ -0,0 +1,22 @@ +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(ASTP SHARED ${SOURCES}) +target_include_directories(ASTP PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(ASTP Orbiter) +target_link_libraries(ASTP Orbitersdk) +target_link_libraries(ASTP 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..92fa6c5fdd --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt @@ -0,0 +1,56 @@ +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/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/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_sys/thread.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${ORBITER_INSTALL_DIR}/Modules/Plugin) + +add_library(ApolloRTCCMFD SHARED ${SOURCES}) +target_include_directories(ApolloRTCCMFD PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(ApolloRTCCMFD Orbiter) +target_link_libraries(ApolloRTCCMFD Orbitersdk) +target_link_libraries(ApolloRTCCMFD WinMM) +target_link_libraries(ApolloRTCCMFD 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..6f65cefd45 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/CMChute/CMakeLists.txt @@ -0,0 +1,19 @@ +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(CMChute SHARED ${SOURCES}) +target_include_directories(CMChute PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(CMChute Orbiter) +target_link_libraries(CMChute 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..defca0631d --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Crawler/CMakeLists.txt @@ -0,0 +1,26 @@ +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(Crawler SHARED ${SOURCES}) +target_include_directories(Crawler PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(Crawler Orbiter) +target_link_libraries(Crawler Orbitersdk) +target_link_libraries(Crawler XRSound) \ 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..95ff4993d1 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LEM/CMakeLists.txt @@ -0,0 +1,109 @@ +# 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(LEM SHARED ${SOURCES}) +target_sources(LEM PRIVATE ${NASSP_SOURCE_ROOT}/src_lm/LEMResources.rc) +target_include_directories(LEM PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(LEM GLU32) +target_link_libraries(LEM dxguid) +target_link_libraries(LEM dinput8) +target_link_libraries(LEM OpenGL32) +target_link_libraries(LEM User32) +target_link_libraries(LEM WinMM) +target_link_libraries(LEM WS2_32) +target_link_libraries(LEM Orbiter) +target_link_libraries(LEM Orbitersdk) +target_link_libraries(LEM PanelSDK) +target_link_libraries(LEM 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..0f2beeb0dc --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/PanelSDK/CMakeLists.txt @@ -0,0 +1,29 @@ +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(PanelSDK STATIC ${SOURCES}) +target_include_directories(PanelSDK PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(PanelSDK Orbiter) +target_link_libraries(PanelSDK Orbitersdk) +target_link_libraries(PanelSDK 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..7c8b0f24fc --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt @@ -0,0 +1,26 @@ +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 ${ORBITER_INSTALL_DIR}/Modules/Startup) + +add_library(ProjectApolloConfigurator SHARED ${SOURCES}) +target_sources(ProjectApolloConfigurator PRIVATE ${NASSP_SOURCE_ROOT}/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.rc) +target_include_directories(ProjectApolloConfigurator PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(ProjectApolloConfigurator dxguid) +target_link_libraries(ProjectApolloConfigurator dinput8) +target_link_libraries(ProjectApolloConfigurator GLU32) +target_link_libraries(ProjectApolloConfigurator User32) +target_link_libraries(ProjectApolloConfigurator Orbiter) +target_link_libraries(ProjectApolloConfigurator Orbitersdk) +target_link_libraries(ProjectApolloConfigurator 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..1544d1c2be --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt @@ -0,0 +1,35 @@ +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 ${ORBITER_INSTALL_DIR}/Modules/Plugin) + +add_library(ProjectApolloMFD SHARED ${SOURCES}) +target_sources(ProjectApolloMFD PRIVATE ${NASSP_SOURCE_ROOT}/src_mfd/MFDResources.rc) +target_include_directories(ProjectApolloMFD PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(ProjectApolloMFD User32) +target_link_libraries(ProjectApolloMFD Orbiter) +target_link_libraries(ProjectApolloMFD Orbitersdk) +target_link_libraries(ProjectApolloMFD WinMM) +target_link_libraries(ProjectApolloMFD WS2_32) \ 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..421bd0d3db --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt @@ -0,0 +1,125 @@ +# 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}/..) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(Saturn1B SHARED ${SOURCES}) +target_sources(Saturn1B PRIVATE ${NASSP_SOURCE_ROOT}/src_csm/Resources.rc) +target_include_directories(Saturn1B PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(Saturn1B GLU32) +target_link_libraries(Saturn1B dxguid) +target_link_libraries(Saturn1B dinput8) +target_link_libraries(Saturn1B OpenGL32) +target_link_libraries(Saturn1B User32) +target_link_libraries(Saturn1B WinMM) +target_link_libraries(Saturn1B WS2_32) +target_link_libraries(Saturn1B lua) +target_link_libraries(Saturn1B Orbiter) +target_link_libraries(Saturn1B Orbitersdk) +target_link_libraries(Saturn1B PanelSDK) +target_link_libraries(Saturn1B XRSound) \ 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..fe3583e25c --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt @@ -0,0 +1,124 @@ +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}/..) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(Saturn5 SHARED ${SOURCES}) +target_sources(Saturn5 PRIVATE ${NASSP_SOURCE_ROOT}/src_csm/Resources.rc) +target_include_directories(Saturn5 PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(Saturn5 GLU32) +target_link_libraries(Saturn5 dxguid) +target_link_libraries(Saturn5 dinput8) +target_link_libraries(Saturn5 OpenGL32) +target_link_libraries(Saturn5 User32) +target_link_libraries(Saturn5 WinMM) +target_link_libraries(Saturn5 WS2_32) +target_link_libraries(Saturn5 lua) +target_link_libraries(Saturn5 Orbiter) +target_link_libraries(Saturn5 Orbitersdk) +target_link_libraries(Saturn5 PanelSDK) +target_link_libraries(Saturn5 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..567d51b39c 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) GetWindowLong(hWnd, GWLP_HINSTANCE), DIRECTINPUT_VERSION, IID_IDirectInput8, (void **)&dx8ppv, NULL); // Give us a DirectInput context if (!FAILED(hr)) { Vesim lmvm(NULL, NULL), csmvm(NULL, NULL); lmvm.setupDevices("LM", dx8ppv); @@ -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 3fad62fbd1105d36612814610cbad88e5ec5d86f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19978 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 U^?Gsl{~(i}N_qYd|84%i0KK7*4gdfE diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/dsound.lib b/Orbitersdk/samples/ProjectApollo/src_aux/dsound.lib deleted file mode 100644 index 37bf188bc4409f2b75e7063389efd9d5cf2aeb02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4042 zcmcIn&2JJx6n}vIf>NqBu`wE{>7k7Y0_96%3|Oj?QrZBGC$k`|mV_39(0Ho%#y_D~ zoBj*ln)K|!gSTEx`e!t$@9pfzEIYeh{FvnJ?7olr&3p6S%wP&Ji{mh@-L7OK<1E(p2D@?(jdIzHz{o5X*}ZYLQ^cIz zYQ5VZ^km10T2!p|=6P9tWkZ;?97Yj4q0UtwMbUaC_w(|8t05QihUY^}4(a8f-OdlX zZTXYxav~}Svrvm0h1q7D7M2Nl8$OJ7rWT!%t0rw!O%TiGU>x9h65xCa;1C&?NZlEL zlK?q&AL%syO9XC20ln`QpF|_*)Y04;w?p3 zRn`jTLTe)wPvRPMT`VqnVaOT2Iq-J7G25gg&32nr(sid!;z>+Db&4JzJe}Lm20VD~ zU`=52M4Ixu!H2~P`vl10%NOlK?XxiZBGPKs`}M`RCYr;S??}H?h7bEJL{C+{l*-0> z1Gqxc^oXB@@TnL3n^=$3{DxCYaC>$FSu`BA2`tmI(5;PDqu2S^dEXB&m6yZCLTR0e zhn@sRmNWujq0`$eKF5?d0|lqh=5lNF6idGb~JPrnHOt5b_eD;-$kLna&9g*m!k`yQ2Lsm_2@kn6!}zJk}2xIspy5Kk(TBn@$KP zY&zin20NJ$`~47c@zQ3-Hco2}(s*?j>7$l07siG5r|G}_(1v2nP&*6lPzjqOr?iZ5zV#PuI25isC1^@s6 diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/dxguid.lib b/Orbitersdk/samples/ProjectApollo/src_aux/dxguid.lib deleted file mode 100644 index f251a925feeee3f641313e418b75539d26f7b77b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 107734 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 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..4c5f87527c 100644 --- a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.h +++ b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.h @@ -128,7 +128,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..3f046670d0 100644 --- a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.h +++ b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.h @@ -35,6 +35,6 @@ class ARoapiModule : public oapi::Module { void clbkPreStep(double simt, double simdt, double mjd); void clbkPostStep(double simt, double simdt, double mjd); void clbkDeleteVessel(OBJHANDLE hVessel); - static int MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); + static OAPI_MSGTYPE MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); }; \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/src_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); From 9cdab425ac1479691ba2c97b267b6b6baf2e033b Mon Sep 17 00:00:00 2001 From: James Pelster Date: Sun, 30 Jun 2024 15:03:10 -0700 Subject: [PATCH 02/45] Add remaining projects Everything is compiling successfully! --- .../samples/ProjectApollo/CMakeLists.txt | 27 ++++++- .../ProjectApollo/Project/EVA/CMakeLists.txt | 19 +++++ .../Project/FloatBag/CMakeLists.txt | 19 +++++ .../Project/Floodlight/CMakeLists.txt | 24 +++++++ .../ProjectApollo/Project/LC34/CMakeLists.txt | 33 +++++++++ .../ProjectApollo/Project/LC37/CMakeLists.txt | 34 +++++++++ .../ProjectApollo/Project/LCC/CMakeLists.txt | 24 +++++++ .../ProjectApollo/Project/LES/CMakeLists.txt | 18 +++++ .../ProjectApollo/Project/LEVA/CMakeLists.txt | 28 ++++++++ .../ProjectApollo/Project/LRV/CMakeLists.txt | 28 ++++++++ .../ProjectApollo/Project/MCC/CMakeLists.txt | 71 +++++++++++++++++++ .../ProjectApollo/Project/ML/CMakeLists.txt | 36 ++++++++++ .../ProjectApollo/Project/MSS/CMakeLists.txt | 26 +++++++ .../ProjectApollo/Project/SIVB/CMakeLists.txt | 45 ++++++++++++ .../Project/Sat1bAbort1/CMakeLists.txt | 27 +++++++ .../Project/Sat1bAbort2/CMakeLists.txt | 27 +++++++ .../Project/Sat5Abort1/CMakeLists.txt | 27 +++++++ .../Project/Sat5Abort2/CMakeLists.txt | 27 +++++++ .../Project/Sat5Abort3/CMakeLists.txt | 29 ++++++++ .../Project/Sat5LMDSC/CMakeLists.txt | 29 ++++++++ .../Project/Skylab/CMakeLists.txt | 34 +++++++++ .../ProjectApollo/Project/VAB/CMakeLists.txt | 27 +++++++ .../ProjectApollo/Project/s1b/CMakeLists.txt | 31 ++++++++ .../ProjectApollo/Project/s1c/CMakeLists.txt | 30 ++++++++ .../ProjectApollo/Project/sii/CMakeLists.txt | 27 +++++++ .../ProjectApollo/Project/sm/CMakeLists.txt | 27 +++++++ .../ProjectApollo/src_launch/LCC_MFD.cpp | 4 +- .../ProjectApollo/src_launch/LCC_MFD.h | 2 +- 28 files changed, 776 insertions(+), 4 deletions(-) create mode 100644 Orbitersdk/samples/ProjectApollo/Project/EVA/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/FloatBag/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/Floodlight/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/LC34/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/LC37/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/LCC/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/LES/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/LEVA/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/LRV/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/MSS/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/SIVB/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort1/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort2/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/Sat5Abort1/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/Sat5Abort2/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/Sat5Abort3/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/Sat5LMDSC/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/Skylab/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/VAB/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/s1b/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/s1c/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/sii/CMakeLists.txt create mode 100644 Orbitersdk/samples/ProjectApollo/Project/sm/CMakeLists.txt diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index 1991926265..ba3d186cce 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -53,8 +53,33 @@ add_subdirectory(Project/ApolloRTCCMFD) add_subdirectory(Project/ASTP) add_subdirectory(Project/CMChute) add_subdirectory(Project/Crawler) +add_subdirectory(Project/EVA) +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) \ No newline at end of file +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) \ 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..953b102d6a --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/EVA/CMakeLists.txt @@ -0,0 +1,19 @@ +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(EVA SHARED ${SOURCES}) +target_include_directories(EVA PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(EVA Orbiter) +target_link_libraries(EVA 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..edaf760713 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/FloatBag/CMakeLists.txt @@ -0,0 +1,19 @@ +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(FloatBag SHARED ${SOURCES}) +target_include_directories(FloatBag PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(FloatBag Orbiter) +target_link_libraries(FloatBag 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..1ba0538975 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Floodlight/CMakeLists.txt @@ -0,0 +1,24 @@ +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(Floodlight SHARED ${SOURCES}) +target_include_directories(Floodlight PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(Floodlight Orbiter) +target_link_libraries(Floodlight Orbitersdk) +target_link_libraries(Floodlight 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..b9762007d1 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LC34/CMakeLists.txt @@ -0,0 +1,33 @@ +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(LC34 SHARED ${SOURCES}) +target_include_directories(LC34 PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(LC34 Orbiter) +target_link_libraries(LC34 Orbitersdk) +target_link_libraries(LC34 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..7351eb2207 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LC37/CMakeLists.txt @@ -0,0 +1,34 @@ +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(LC37 SHARED ${SOURCES}) +target_include_directories(LC37 PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(LC37 Orbiter) +target_link_libraries(LC37 Orbitersdk) +target_link_libraries(LC37 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..ab75ea16e7 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LCC/CMakeLists.txt @@ -0,0 +1,24 @@ +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(LCC SHARED ${SOURCES}) +target_include_directories(LCC PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(LCC Orbiter) +target_link_libraries(LCC Orbitersdk) \ 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..4008fe42e4 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LES/CMakeLists.txt @@ -0,0 +1,18 @@ +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(LES SHARED ${SOURCES}) +target_include_directories(LES PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(LES Orbiter) +target_link_libraries(LES 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..e91fb9ccf4 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LEVA/CMakeLists.txt @@ -0,0 +1,28 @@ +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(LEVA SHARED ${SOURCES}) +target_include_directories(LEVA PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(LEVA Orbiter) +target_link_libraries(LEVA Orbitersdk) +target_link_libraries(LEVA 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..a2c535cd5d --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LRV/CMakeLists.txt @@ -0,0 +1,28 @@ +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(LRV SHARED ${SOURCES}) +target_include_directories(LRV PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(LRV Orbiter) +target_link_libraries(LRV Orbitersdk) +target_link_libraries(LRV 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..638389de88 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt @@ -0,0 +1,71 @@ +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_launch/mcc.cpp + ${NASSP_SOURCE_ROOT}/src_launch/mccvc.cpp + ${NASSP_SOURCE_ROOT}/src_launch/mccvessel.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/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/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_sys/thread.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${ORBITER_INSTALL_DIR}/Modules/Plugin) + +add_library(MCC SHARED ${SOURCES}) +target_include_directories(MCC PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(MCC Orbiter) +target_link_libraries(MCC Orbitersdk) +target_link_libraries(MCC WinMM) +target_link_libraries(MCC WS2_32) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt new file mode 100644 index 0000000000..e203fa7641 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt @@ -0,0 +1,36 @@ +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(ML SHARED ${SOURCES}) +target_include_directories(ML PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(ML Orbiter) +target_link_libraries(ML Orbitersdk) +target_link_libraries(ML 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..6cdcf682b8 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/MSS/CMakeLists.txt @@ -0,0 +1,26 @@ +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(MSS SHARED ${SOURCES}) +target_include_directories(MSS PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(MSS Orbiter) +target_link_libraries(MSS Orbitersdk) +target_link_libraries(MSS XRSound) \ 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..3da4b4de12 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/SIVB/CMakeLists.txt @@ -0,0 +1,45 @@ +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(SIVB SHARED ${SOURCES}) +target_include_directories(SIVB PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(SIVB Orbiter) +target_link_libraries(SIVB Orbitersdk) +target_link_libraries(SIVB PanelSDK) +target_link_libraries(SIVB 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..2f53df98b3 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort1/CMakeLists.txt @@ -0,0 +1,27 @@ +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(Sat1bAbort1 SHARED ${SOURCES}) +target_include_directories(Sat1bAbort1 PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(Sat1bAbort1 Orbiter) +target_link_libraries(Sat1bAbort1 Orbitersdk) +target_link_libraries(Sat1bAbort1 PanelSDK) +target_link_libraries(Sat1bAbort1 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..e67c2bc9dc --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort2/CMakeLists.txt @@ -0,0 +1,27 @@ +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(Sat1bAbort2 SHARED ${SOURCES}) +target_include_directories(Sat1bAbort2 PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(Sat1bAbort2 Orbiter) +target_link_libraries(Sat1bAbort2 Orbitersdk) +target_link_libraries(Sat1bAbort2 PanelSDK) +target_link_libraries(Sat1bAbort2 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..382fa5d3d2 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort1/CMakeLists.txt @@ -0,0 +1,27 @@ +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(Sat5Abort1 SHARED ${SOURCES}) +target_include_directories(Sat5Abort1 PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(Sat5Abort1 Orbiter) +target_link_libraries(Sat5Abort1 Orbitersdk) +target_link_libraries(Sat5Abort1 PanelSDK) +target_link_libraries(Sat5Abort1 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..1ace977725 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort2/CMakeLists.txt @@ -0,0 +1,27 @@ +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(Sat5Abort2 SHARED ${SOURCES}) +target_include_directories(Sat5Abort2 PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(Sat5Abort2 Orbiter) +target_link_libraries(Sat5Abort2 Orbitersdk) +target_link_libraries(Sat5Abort2 PanelSDK) +target_link_libraries(Sat5Abort2 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..89ac5de03b --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort3/CMakeLists.txt @@ -0,0 +1,29 @@ +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(Sat5Abort3 SHARED ${SOURCES}) +target_include_directories(Sat5Abort3 PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(Sat5Abort3 Orbiter) +target_link_libraries(Sat5Abort3 Orbitersdk) +target_link_libraries(Sat5Abort3 PanelSDK) +target_link_libraries(Sat5Abort3 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..f03ceb5636 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5LMDSC/CMakeLists.txt @@ -0,0 +1,29 @@ +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(Sat5LMDSC SHARED ${SOURCES}) +target_include_directories(Sat5LMDSC PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(Sat5LMDSC Orbiter) +target_link_libraries(Sat5LMDSC Orbitersdk) +target_link_libraries(Sat5LMDSC PanelSDK) +target_link_libraries(Sat5LMDSC XRSound) \ 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..7967884fe7 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Skylab/CMakeLists.txt @@ -0,0 +1,34 @@ +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(Skylab SHARED ${SOURCES}) +target_include_directories(Skylab PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(Skylab Orbiter) +target_link_libraries(Skylab Orbitersdk) +target_link_libraries(Skylab PanelSDK) +target_link_libraries(Skylab 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..a153d402bf --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/VAB/CMakeLists.txt @@ -0,0 +1,27 @@ +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(VAB SHARED ${SOURCES}) +target_include_directories(VAB PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(VAB Orbiter) +target_link_libraries(VAB Orbitersdk) +target_link_libraries(VAB 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..1d7901f3f1 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/s1b/CMakeLists.txt @@ -0,0 +1,31 @@ +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(s1b SHARED ${SOURCES}) +target_include_directories(s1b PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(s1b Orbiter) +target_link_libraries(s1b Orbitersdk) +target_link_libraries(s1b PanelSDK) +target_link_libraries(s1b 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..4b6c34a630 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/s1c/CMakeLists.txt @@ -0,0 +1,30 @@ +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(s1c SHARED ${SOURCES}) +target_include_directories(s1c PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(s1c Orbiter) +target_link_libraries(s1c Orbitersdk) +target_link_libraries(s1c PanelSDK) +target_link_libraries(s1c 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..20fa17e342 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/sii/CMakeLists.txt @@ -0,0 +1,27 @@ +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(sii SHARED ${SOURCES}) +target_include_directories(sii PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(sii Orbiter) +target_link_libraries(sii Orbitersdk) +target_link_libraries(sii PanelSDK) +target_link_libraries(sii 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..046f87e340 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/sm/CMakeLists.txt @@ -0,0 +1,27 @@ +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(sm SHARED ${SOURCES}) +target_include_directories(sm PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(sm Orbiter) +target_link_libraries(sm Orbitersdk) +target_link_libraries(sm PanelSDK) +target_link_libraries(sm XRSound) \ No newline at end of file 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..5d1e73daf3 100644 --- a/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h +++ b/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h @@ -50,7 +50,7 @@ class LCC_MFD :public MFD2 void set_SLCCDiscreteInput(int n, bool set); void LoadCheckoutProgram(const char *str); - static int MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); + static OAPI_MSGTYPE MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); protected: const LCCMFDButtons m_buttonPages; From f1b3188f048be583bfbd855b584d681fc666a0ae Mon Sep 17 00:00:00 2001 From: James Pelster Date: Sun, 30 Jun 2024 15:21:09 -0700 Subject: [PATCH 03/45] Fix MCC vessel build output location --- Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt index 638389de88..b12fd1811f 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt @@ -61,7 +61,7 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${ORBITER_INSTALL_DIR}/Modules/Plugin) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${ORBITER_INSTALL_DIR}/Modules/ProjectApollo) add_library(MCC SHARED ${SOURCES}) target_include_directories(MCC PRIVATE ${INCLUDE_DIRS}) From f6c9e4d17c5d9cfd363e55c134498c32cfecad96 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Sun, 30 Jun 2024 17:06:16 -0700 Subject: [PATCH 04/45] Add compatibility with Orbiter Beta R90 --- Orbitersdk/samples/ProjectApollo/CMakeLists.txt | 12 ++++++++++-- Orbitersdk/samples/ProjectApollo/CMakeSettings.json | 9 +-------- .../ProjectApollo/Project/Saturn1B/CMakeLists.txt | 7 ++++++- .../ProjectApollo/Project/Saturn5/CMakeLists.txt | 7 ++++++- .../samples/ProjectApollo/src_launch/LCC_MFD.h | 5 +++++ .../src_mfd/ProjectApolloChecklistMFD.h | 4 ++++ .../samples/ProjectApollo/src_mfd/ProjectApolloMFD.h | 4 ++++ .../samples/ProjectApollo/src_rtccmfd/ARoapiModule.h | 4 ++++ 8 files changed, 40 insertions(+), 12 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index ba3d186cce..cd271d46d4 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -6,6 +6,8 @@ project(NASSP VERSION 8.0.3) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) +option(OPENORBITER OFF) + #Add /permissive if using C++20 or higher #add_compile_options(/permissive) @@ -32,8 +34,14 @@ endif() if(MSVC) # Flag pointer truncation as an error because if it happens that's bad news! - add_compile_options(/we4311) - #add_link_options("/NODEFAULTLIB:\"LIBCMTD\"") + 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-wide variables diff --git a/Orbitersdk/samples/ProjectApollo/CMakeSettings.json b/Orbitersdk/samples/ProjectApollo/CMakeSettings.json index 67d580ab80..5413c971a2 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeSettings.json +++ b/Orbitersdk/samples/ProjectApollo/CMakeSettings.json @@ -4,19 +4,12 @@ "name": "x64-Debug", "generator": "Ninja", "configurationType": "Debug", - "inheritEnvironments": [ "msvc_x64_x64" ], "buildRoot": "${projectDir}\\out\\build\\${name}", "installRoot": "${projectDir}\\out\\install\\${name}", "cmakeCommandArgs": "", "buildCommandArgs": "", "ctestCommandArgs": "", - "variables": [ - { - "name": "ORBITER_INSTALL_DIR", - "value": "C:\\Users\\jpmac\\Desktop\\Games - SSD\\OpenOrbiter\\out\\build\\windows-x64-debug", - "type": "STRING" - } - ] + "inheritEnvironments": [ "msvc_x64_x64" ] }, { "name": "x64-Release", diff --git a/Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt index 421bd0d3db..aace30548c 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt @@ -104,6 +104,7 @@ set(SOURCES ) 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) @@ -118,7 +119,11 @@ target_link_libraries(Saturn1B OpenGL32) target_link_libraries(Saturn1B User32) target_link_libraries(Saturn1B WinMM) target_link_libraries(Saturn1B WS2_32) -target_link_libraries(Saturn1B lua) +if(OPENORBITER) + target_link_libraries(Saturn1B lua) +else() + target_link_libraries(Saturn1B lua5.1) +endif() target_link_libraries(Saturn1B Orbiter) target_link_libraries(Saturn1B Orbitersdk) target_link_libraries(Saturn1B PanelSDK) diff --git a/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt index fe3583e25c..7e28831ede 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt @@ -103,6 +103,7 @@ set(SOURCES ) 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) @@ -117,7 +118,11 @@ target_link_libraries(Saturn5 OpenGL32) target_link_libraries(Saturn5 User32) target_link_libraries(Saturn5 WinMM) target_link_libraries(Saturn5 WS2_32) -target_link_libraries(Saturn5 lua) +if(OPENORBITER) + target_link_libraries(Saturn5 lua) +else() + target_link_libraries(Saturn5 lua5.1) +endif() target_link_libraries(Saturn5 Orbiter) target_link_libraries(Saturn5 Orbitersdk) target_link_libraries(Saturn5 PanelSDK) diff --git a/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h b/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h index 5d1e73daf3..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: diff --git a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.h b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.h index fdaf7ddc1b..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); diff --git a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.h b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.h index 4c5f87527c..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 /// diff --git a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.h b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.h index 3f046670d0..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); From 58c928bcb6449e3b028656efc5f24084d3428cdd Mon Sep 17 00:00:00 2001 From: James Pelster Date: Sun, 30 Jun 2024 17:40:31 -0700 Subject: [PATCH 05/45] Delete CMakeSettings.json --- .../samples/ProjectApollo/CMakeSettings.json | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 Orbitersdk/samples/ProjectApollo/CMakeSettings.json diff --git a/Orbitersdk/samples/ProjectApollo/CMakeSettings.json b/Orbitersdk/samples/ProjectApollo/CMakeSettings.json deleted file mode 100644 index 5413c971a2..0000000000 --- a/Orbitersdk/samples/ProjectApollo/CMakeSettings.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "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" ] - }, - { - "name": "x64-Release", - "generator": "Ninja", - "configurationType": "RelWithDebInfo", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "msvc_x64_x64" ] - }, - { - "name": "x86-Debug", - "generator": "Ninja", - "configurationType": "Debug", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "msvc_x86" ] - }, - { - "name": "x86-Release", - "generator": "Ninja", - "configurationType": "RelWithDebInfo", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "msvc_x86" ] - } - ] -} \ No newline at end of file From 662c187290c5936284de2cf83a2556ee95cfa77d Mon Sep 17 00:00:00 2001 From: James Pelster Date: Sun, 30 Jun 2024 17:58:37 -0700 Subject: [PATCH 06/45] Add new default CMakeSettings.json This should hopefully be all sane defaults, which we won't change unless we have to. --- .../samples/ProjectApollo/CMakeSettings.json | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 Orbitersdk/samples/ProjectApollo/CMakeSettings.json 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 From 9bfc73ed20ef2cd658ea228c1856f003a208caba Mon Sep 17 00:00:00 2001 From: James Pelster Date: Sun, 30 Jun 2024 18:00:15 -0700 Subject: [PATCH 07/45] Ignore further changes to CMakeSettings.json This should avoid myself (or other people) from accidentally committing situational config options based on their personal installations of NASSP/Orbiter. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e54c63e7e8..41123baf95 100644 --- a/.gitignore +++ b/.gitignore @@ -143,3 +143,4 @@ XRSound/ /.ninja_deps # Ignore Matlab log analyzers /*.m +/Orbitersdk/samples/ProjectApollo/CMakeSettings.json From feaafdb175de76165bd3a435558bf1f4fb03e7c2 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Sun, 30 Jun 2024 18:01:36 -0700 Subject: [PATCH 08/45] More gitignore changes --- .gitignore | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.gitignore b/.gitignore index 41123baf95..3ca32845a0 100644 --- a/.gitignore +++ b/.gitignore @@ -144,3 +144,25 @@ XRSound/ # 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 From 8bcb00c6e5d615421576413caf407735e685e8a1 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Mon, 22 Jul 2024 19:02:29 -0700 Subject: [PATCH 09/45] Un-hardcode project name into linking details --- .../ProjectApollo/Project/ASTP/CMakeLists.txt | 10 +++---- .../Project/ApolloRTCCMFD/CMakeLists.txt | 12 ++++---- .../Project/CMChute/CMakeLists.txt | 8 ++--- .../Project/Crawler/CMakeLists.txt | 10 +++---- .../ProjectApollo/Project/EVA/CMakeLists.txt | 8 ++--- .../Project/FloatBag/CMakeLists.txt | 8 ++--- .../Project/Floodlight/CMakeLists.txt | 10 +++---- .../ProjectApollo/Project/LC34/CMakeLists.txt | 10 +++---- .../ProjectApollo/Project/LC37/CMakeLists.txt | 10 +++---- .../ProjectApollo/Project/LCC/CMakeLists.txt | 8 ++--- .../ProjectApollo/Project/LEM/CMakeLists.txt | 26 ++++++++-------- .../ProjectApollo/Project/LES/CMakeLists.txt | 8 ++--- .../ProjectApollo/Project/LEVA/CMakeLists.txt | 10 +++---- .../ProjectApollo/Project/LRV/CMakeLists.txt | 10 +++---- .../ProjectApollo/Project/MCC/CMakeLists.txt | 12 ++++---- .../ProjectApollo/Project/ML/CMakeLists.txt | 10 +++---- .../ProjectApollo/Project/MSS/CMakeLists.txt | 10 +++---- .../Project/PanelSDK/CMakeLists.txt | 10 +++---- .../ProjectApolloConfigurator/CMakeLists.txt | 18 +++++------ .../Project/ProjectApolloMFD/CMakeLists.txt | 14 ++++----- .../ProjectApollo/Project/SIVB/CMakeLists.txt | 12 ++++---- .../Project/Sat1bAbort1/CMakeLists.txt | 12 ++++---- .../Project/Sat1bAbort2/CMakeLists.txt | 12 ++++---- .../Project/Sat5Abort1/CMakeLists.txt | 12 ++++---- .../Project/Sat5Abort2/CMakeLists.txt | 12 ++++---- .../Project/Sat5Abort3/CMakeLists.txt | 12 ++++---- .../Project/Sat5LMDSC/CMakeLists.txt | 12 ++++---- .../Project/Saturn1B/CMakeLists.txt | 30 +++++++++---------- .../Project/Saturn5/CMakeLists.txt | 30 +++++++++---------- .../Project/Skylab/CMakeLists.txt | 12 ++++---- .../ProjectApollo/Project/VAB/CMakeLists.txt | 10 +++---- .../ProjectApollo/Project/s1b/CMakeLists.txt | 12 ++++---- .../ProjectApollo/Project/s1c/CMakeLists.txt | 12 ++++---- .../ProjectApollo/Project/sii/CMakeLists.txt | 12 ++++---- .../ProjectApollo/Project/sm/CMakeLists.txt | 12 ++++---- 35 files changed, 218 insertions(+), 218 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt index 49f6be530d..0508b6cfdc 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt @@ -15,8 +15,8 @@ link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(ASTP SHARED ${SOURCES}) -target_include_directories(ASTP PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(ASTP Orbiter) -target_link_libraries(ASTP Orbitersdk) -target_link_libraries(ASTP PanelSDK) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} 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 index 92fa6c5fdd..97a988b22c 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt @@ -48,9 +48,9 @@ link_directories(${ORBITERSDK_DIR}/lib) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${ORBITER_INSTALL_DIR}/Modules/Plugin) -add_library(ApolloRTCCMFD SHARED ${SOURCES}) -target_include_directories(ApolloRTCCMFD PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(ApolloRTCCMFD Orbiter) -target_link_libraries(ApolloRTCCMFD Orbitersdk) -target_link_libraries(ApolloRTCCMFD WinMM) -target_link_libraries(ApolloRTCCMFD WS2_32) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} WinMM) +target_link_libraries(${PROJECT_NAME} 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 index 6f65cefd45..60ae27642b 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/CMChute/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/CMChute/CMakeLists.txt @@ -13,7 +13,7 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) -add_library(CMChute SHARED ${SOURCES}) -target_include_directories(CMChute PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(CMChute Orbiter) -target_link_libraries(CMChute Orbitersdk) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} 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 index defca0631d..e4c3bbf644 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Crawler/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Crawler/CMakeLists.txt @@ -19,8 +19,8 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) -add_library(Crawler SHARED ${SOURCES}) -target_include_directories(Crawler PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(Crawler Orbiter) -target_link_libraries(Crawler Orbitersdk) -target_link_libraries(Crawler XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} 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 index 953b102d6a..880e00c56c 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/EVA/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/EVA/CMakeLists.txt @@ -13,7 +13,7 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) -add_library(EVA SHARED ${SOURCES}) -target_include_directories(EVA PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(EVA Orbiter) -target_link_libraries(EVA Orbitersdk) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} 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 index edaf760713..e5d8f54480 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/FloatBag/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/FloatBag/CMakeLists.txt @@ -13,7 +13,7 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) -add_library(FloatBag SHARED ${SOURCES}) -target_include_directories(FloatBag PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(FloatBag Orbiter) -target_link_libraries(FloatBag Orbitersdk) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} 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 index 1ba0538975..038e583eb3 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Floodlight/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Floodlight/CMakeLists.txt @@ -17,8 +17,8 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) -add_library(Floodlight SHARED ${SOURCES}) -target_include_directories(Floodlight PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(Floodlight Orbiter) -target_link_libraries(Floodlight Orbitersdk) -target_link_libraries(Floodlight XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} 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 index b9762007d1..8e5af0c73a 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/LC34/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/LC34/CMakeLists.txt @@ -26,8 +26,8 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) -add_library(LC34 SHARED ${SOURCES}) -target_include_directories(LC34 PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(LC34 Orbiter) -target_link_libraries(LC34 Orbitersdk) -target_link_libraries(LC34 XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} 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 index 7351eb2207..29bff2fab6 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/LC37/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/LC37/CMakeLists.txt @@ -27,8 +27,8 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) -add_library(LC37 SHARED ${SOURCES}) -target_include_directories(LC37 PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(LC37 Orbiter) -target_link_libraries(LC37 Orbitersdk) -target_link_libraries(LC37 XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} 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 index ab75ea16e7..928768d194 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/LCC/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/LCC/CMakeLists.txt @@ -18,7 +18,7 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) -add_library(LCC SHARED ${SOURCES}) -target_include_directories(LCC PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(LCC Orbiter) -target_link_libraries(LCC Orbitersdk) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} 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 index 95ff4993d1..cd3b0b7cee 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/LEM/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/LEM/CMakeLists.txt @@ -93,17 +93,17 @@ link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(LEM SHARED ${SOURCES}) +add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_sources(LEM PRIVATE ${NASSP_SOURCE_ROOT}/src_lm/LEMResources.rc) -target_include_directories(LEM PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(LEM GLU32) -target_link_libraries(LEM dxguid) -target_link_libraries(LEM dinput8) -target_link_libraries(LEM OpenGL32) -target_link_libraries(LEM User32) -target_link_libraries(LEM WinMM) -target_link_libraries(LEM WS2_32) -target_link_libraries(LEM Orbiter) -target_link_libraries(LEM Orbitersdk) -target_link_libraries(LEM PanelSDK) -target_link_libraries(LEM XRSound) \ No newline at end of file +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} GLU32) +target_link_libraries(${PROJECT_NAME} dxguid) +target_link_libraries(${PROJECT_NAME} dinput8) +target_link_libraries(${PROJECT_NAME} OpenGL32) +target_link_libraries(${PROJECT_NAME} User32) +target_link_libraries(${PROJECT_NAME} WinMM) +target_link_libraries(${PROJECT_NAME} WS2_32) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} PanelSDK) +target_link_libraries(${PROJECT_NAME} 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 index 4008fe42e4..1c8ff3243e 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/LES/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/LES/CMakeLists.txt @@ -12,7 +12,7 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) -add_library(LES SHARED ${SOURCES}) -target_include_directories(LES PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(LES Orbiter) -target_link_libraries(LES Orbitersdk) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} 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 index e91fb9ccf4..2f88c980b9 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/LEVA/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/LEVA/CMakeLists.txt @@ -21,8 +21,8 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) -add_library(LEVA SHARED ${SOURCES}) -target_include_directories(LEVA PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(LEVA Orbiter) -target_link_libraries(LEVA Orbitersdk) -target_link_libraries(LEVA XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} 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 index a2c535cd5d..f401092bca 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/LRV/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/LRV/CMakeLists.txt @@ -21,8 +21,8 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) -add_library(LRV SHARED ${SOURCES}) -target_include_directories(LRV PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(LRV Orbiter) -target_link_libraries(LRV Orbitersdk) -target_link_libraries(LRV XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} 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 index b12fd1811f..f2c89c5ce8 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt @@ -63,9 +63,9 @@ link_directories(${ORBITERSDK_DIR}/lib) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${ORBITER_INSTALL_DIR}/Modules/ProjectApollo) -add_library(MCC SHARED ${SOURCES}) -target_include_directories(MCC PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(MCC Orbiter) -target_link_libraries(MCC Orbitersdk) -target_link_libraries(MCC WinMM) -target_link_libraries(MCC WS2_32) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} WinMM) +target_link_libraries(${PROJECT_NAME} WS2_32) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt index e203fa7641..00ad54f3ea 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt @@ -29,8 +29,8 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) -add_library(ML SHARED ${SOURCES}) -target_include_directories(ML PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(ML Orbiter) -target_link_libraries(ML Orbitersdk) -target_link_libraries(ML XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} 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 index 6cdcf682b8..ea88cfef96 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/MSS/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/MSS/CMakeLists.txt @@ -19,8 +19,8 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) -add_library(MSS SHARED ${SOURCES}) -target_include_directories(MSS PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(MSS Orbiter) -target_link_libraries(MSS Orbitersdk) -target_link_libraries(MSS XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} 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 index 0f2beeb0dc..e136330eb5 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/PanelSDK/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/PanelSDK/CMakeLists.txt @@ -22,8 +22,8 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) -add_library(PanelSDK STATIC ${SOURCES}) -target_include_directories(PanelSDK PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(PanelSDK Orbiter) -target_link_libraries(PanelSDK Orbitersdk) -target_link_libraries(PanelSDK XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} STATIC ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} 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 index 7c8b0f24fc..dc80a66df6 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt @@ -14,13 +14,13 @@ link_directories(${ORBITERSDK_DIR}/lib) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${ORBITER_INSTALL_DIR}/Modules/Startup) -add_library(ProjectApolloConfigurator SHARED ${SOURCES}) +add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_sources(ProjectApolloConfigurator PRIVATE ${NASSP_SOURCE_ROOT}/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.rc) -target_include_directories(ProjectApolloConfigurator PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(ProjectApolloConfigurator dxguid) -target_link_libraries(ProjectApolloConfigurator dinput8) -target_link_libraries(ProjectApolloConfigurator GLU32) -target_link_libraries(ProjectApolloConfigurator User32) -target_link_libraries(ProjectApolloConfigurator Orbiter) -target_link_libraries(ProjectApolloConfigurator Orbitersdk) -target_link_libraries(ProjectApolloConfigurator OpenGL32) \ No newline at end of file +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} dxguid) +target_link_libraries(${PROJECT_NAME} dinput8) +target_link_libraries(${PROJECT_NAME} GLU32) +target_link_libraries(${PROJECT_NAME} User32) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} 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 index 1544d1c2be..d37aa4e0fd 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt @@ -25,11 +25,11 @@ link_directories(${ORBITERSDK_DIR}/lib) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${ORBITER_INSTALL_DIR}/Modules/Plugin) -add_library(ProjectApolloMFD SHARED ${SOURCES}) +add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_sources(ProjectApolloMFD PRIVATE ${NASSP_SOURCE_ROOT}/src_mfd/MFDResources.rc) -target_include_directories(ProjectApolloMFD PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(ProjectApolloMFD User32) -target_link_libraries(ProjectApolloMFD Orbiter) -target_link_libraries(ProjectApolloMFD Orbitersdk) -target_link_libraries(ProjectApolloMFD WinMM) -target_link_libraries(ProjectApolloMFD WS2_32) \ No newline at end of file +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} User32) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} WinMM) +target_link_libraries(${PROJECT_NAME} 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 index 3da4b4de12..ed4c4470fa 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/SIVB/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/SIVB/CMakeLists.txt @@ -37,9 +37,9 @@ link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(SIVB SHARED ${SOURCES}) -target_include_directories(SIVB PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(SIVB Orbiter) -target_link_libraries(SIVB Orbitersdk) -target_link_libraries(SIVB PanelSDK) -target_link_libraries(SIVB XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} PanelSDK) +target_link_libraries(${PROJECT_NAME} 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 index 2f53df98b3..e0c42a3479 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort1/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort1/CMakeLists.txt @@ -19,9 +19,9 @@ link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(Sat1bAbort1 SHARED ${SOURCES}) -target_include_directories(Sat1bAbort1 PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(Sat1bAbort1 Orbiter) -target_link_libraries(Sat1bAbort1 Orbitersdk) -target_link_libraries(Sat1bAbort1 PanelSDK) -target_link_libraries(Sat1bAbort1 XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} PanelSDK) +target_link_libraries(${PROJECT_NAME} 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 index e67c2bc9dc..0f98523b39 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort2/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort2/CMakeLists.txt @@ -19,9 +19,9 @@ link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(Sat1bAbort2 SHARED ${SOURCES}) -target_include_directories(Sat1bAbort2 PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(Sat1bAbort2 Orbiter) -target_link_libraries(Sat1bAbort2 Orbitersdk) -target_link_libraries(Sat1bAbort2 PanelSDK) -target_link_libraries(Sat1bAbort2 XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} PanelSDK) +target_link_libraries(${PROJECT_NAME} 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 index 382fa5d3d2..33989d989e 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort1/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort1/CMakeLists.txt @@ -19,9 +19,9 @@ link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(Sat5Abort1 SHARED ${SOURCES}) -target_include_directories(Sat5Abort1 PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(Sat5Abort1 Orbiter) -target_link_libraries(Sat5Abort1 Orbitersdk) -target_link_libraries(Sat5Abort1 PanelSDK) -target_link_libraries(Sat5Abort1 XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} PanelSDK) +target_link_libraries(${PROJECT_NAME} 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 index 1ace977725..91dd0ffc9c 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort2/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort2/CMakeLists.txt @@ -19,9 +19,9 @@ link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(Sat5Abort2 SHARED ${SOURCES}) -target_include_directories(Sat5Abort2 PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(Sat5Abort2 Orbiter) -target_link_libraries(Sat5Abort2 Orbitersdk) -target_link_libraries(Sat5Abort2 PanelSDK) -target_link_libraries(Sat5Abort2 XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} PanelSDK) +target_link_libraries(${PROJECT_NAME} 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 index 89ac5de03b..ac3f7282f1 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort3/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort3/CMakeLists.txt @@ -21,9 +21,9 @@ link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(Sat5Abort3 SHARED ${SOURCES}) -target_include_directories(Sat5Abort3 PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(Sat5Abort3 Orbiter) -target_link_libraries(Sat5Abort3 Orbitersdk) -target_link_libraries(Sat5Abort3 PanelSDK) -target_link_libraries(Sat5Abort3 XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} PanelSDK) +target_link_libraries(${PROJECT_NAME} 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 index f03ceb5636..e650dd3986 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Sat5LMDSC/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5LMDSC/CMakeLists.txt @@ -21,9 +21,9 @@ link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(Sat5LMDSC SHARED ${SOURCES}) -target_include_directories(Sat5LMDSC PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(Sat5LMDSC Orbiter) -target_link_libraries(Sat5LMDSC Orbitersdk) -target_link_libraries(Sat5LMDSC PanelSDK) -target_link_libraries(Sat5LMDSC XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} PanelSDK) +target_link_libraries(${PROJECT_NAME} 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 index aace30548c..d6e30860ee 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt @@ -109,22 +109,22 @@ link_directories(${ORBITERSDK_DIR}/..) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(Saturn1B SHARED ${SOURCES}) +add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_sources(Saturn1B PRIVATE ${NASSP_SOURCE_ROOT}/src_csm/Resources.rc) -target_include_directories(Saturn1B PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(Saturn1B GLU32) -target_link_libraries(Saturn1B dxguid) -target_link_libraries(Saturn1B dinput8) -target_link_libraries(Saturn1B OpenGL32) -target_link_libraries(Saturn1B User32) -target_link_libraries(Saturn1B WinMM) -target_link_libraries(Saturn1B WS2_32) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} GLU32) +target_link_libraries(${PROJECT_NAME} dxguid) +target_link_libraries(${PROJECT_NAME} dinput8) +target_link_libraries(${PROJECT_NAME} OpenGL32) +target_link_libraries(${PROJECT_NAME} User32) +target_link_libraries(${PROJECT_NAME} WinMM) +target_link_libraries(${PROJECT_NAME} WS2_32) if(OPENORBITER) - target_link_libraries(Saturn1B lua) + target_link_libraries(${PROJECT_NAME} lua) else() - target_link_libraries(Saturn1B lua5.1) + target_link_libraries(${PROJECT_NAME} lua5.1) endif() -target_link_libraries(Saturn1B Orbiter) -target_link_libraries(Saturn1B Orbitersdk) -target_link_libraries(Saturn1B PanelSDK) -target_link_libraries(Saturn1B XRSound) \ No newline at end of file +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} PanelSDK) +target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt index 7e28831ede..7a81985667 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt @@ -108,22 +108,22 @@ link_directories(${ORBITERSDK_DIR}/..) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(Saturn5 SHARED ${SOURCES}) +add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_sources(Saturn5 PRIVATE ${NASSP_SOURCE_ROOT}/src_csm/Resources.rc) -target_include_directories(Saturn5 PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(Saturn5 GLU32) -target_link_libraries(Saturn5 dxguid) -target_link_libraries(Saturn5 dinput8) -target_link_libraries(Saturn5 OpenGL32) -target_link_libraries(Saturn5 User32) -target_link_libraries(Saturn5 WinMM) -target_link_libraries(Saturn5 WS2_32) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} GLU32) +target_link_libraries(${PROJECT_NAME} dxguid) +target_link_libraries(${PROJECT_NAME} dinput8) +target_link_libraries(${PROJECT_NAME} OpenGL32) +target_link_libraries(${PROJECT_NAME} User32) +target_link_libraries(${PROJECT_NAME} WinMM) +target_link_libraries(${PROJECT_NAME} WS2_32) if(OPENORBITER) - target_link_libraries(Saturn5 lua) + target_link_libraries(${PROJECT_NAME} lua) else() - target_link_libraries(Saturn5 lua5.1) + target_link_libraries(${PROJECT_NAME} lua5.1) endif() -target_link_libraries(Saturn5 Orbiter) -target_link_libraries(Saturn5 Orbitersdk) -target_link_libraries(Saturn5 PanelSDK) -target_link_libraries(Saturn5 XRSound) \ No newline at end of file +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} PanelSDK) +target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Skylab/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Skylab/CMakeLists.txt index 7967884fe7..bc0e61aca3 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Skylab/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Skylab/CMakeLists.txt @@ -26,9 +26,9 @@ link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(Skylab SHARED ${SOURCES}) -target_include_directories(Skylab PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(Skylab Orbiter) -target_link_libraries(Skylab Orbitersdk) -target_link_libraries(Skylab PanelSDK) -target_link_libraries(Skylab XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} PanelSDK) +target_link_libraries(${PROJECT_NAME} 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 index a153d402bf..fcd112ef7a 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/VAB/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/VAB/CMakeLists.txt @@ -20,8 +20,8 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) -add_library(VAB SHARED ${SOURCES}) -target_include_directories(VAB PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(VAB Orbiter) -target_link_libraries(VAB Orbitersdk) -target_link_libraries(VAB XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} 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 index 1d7901f3f1..0ab600f7dc 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/s1b/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/s1b/CMakeLists.txt @@ -23,9 +23,9 @@ link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(s1b SHARED ${SOURCES}) -target_include_directories(s1b PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(s1b Orbiter) -target_link_libraries(s1b Orbitersdk) -target_link_libraries(s1b PanelSDK) -target_link_libraries(s1b XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} PanelSDK) +target_link_libraries(${PROJECT_NAME} 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 index 4b6c34a630..82cc3baf52 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/s1c/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/s1c/CMakeLists.txt @@ -22,9 +22,9 @@ link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(s1c SHARED ${SOURCES}) -target_include_directories(s1c PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(s1c Orbiter) -target_link_libraries(s1c Orbitersdk) -target_link_libraries(s1c PanelSDK) -target_link_libraries(s1c XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} PanelSDK) +target_link_libraries(${PROJECT_NAME} 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 index 20fa17e342..2d76920f60 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/sii/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/sii/CMakeLists.txt @@ -19,9 +19,9 @@ link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(sii SHARED ${SOURCES}) -target_include_directories(sii PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(sii Orbiter) -target_link_libraries(sii Orbitersdk) -target_link_libraries(sii PanelSDK) -target_link_libraries(sii XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} PanelSDK) +target_link_libraries(${PROJECT_NAME} 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 index 046f87e340..f42cb7d50b 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/sm/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/sm/CMakeLists.txt @@ -19,9 +19,9 @@ link_directories(${ORBITERSDK_DIR}/lib) link_directories(${ORBITERSDK_DIR}/XRSound) link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) -add_library(sm SHARED ${SOURCES}) -target_include_directories(sm PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(sm Orbiter) -target_link_libraries(sm Orbitersdk) -target_link_libraries(sm PanelSDK) -target_link_libraries(sm XRSound) \ No newline at end of file +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} Orbiter) +target_link_libraries(${PROJECT_NAME} Orbitersdk) +target_link_libraries(${PROJECT_NAME} PanelSDK) +target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file From ec361c039cf382f1379875ec9cc7936fe2712cd5 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Mon, 22 Jul 2024 19:16:15 -0700 Subject: [PATCH 10/45] Add new Ascent/Rendezvous Monitor source files to projects --- .../samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt | 2 ++ Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt index 97a988b22c..6a1b09581b 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt @@ -20,6 +20,7 @@ set(SOURCES ${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 @@ -37,6 +38,7 @@ set(SOURCES ${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 diff --git a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt index f2c89c5ce8..7d2a2db66b 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt @@ -35,6 +35,7 @@ set(SOURCES ${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 @@ -49,6 +50,7 @@ set(SOURCES ${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 From e887853245fa61f9a1330364b66e51577b722fe8 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Mon, 22 Jul 2024 19:18:28 -0700 Subject: [PATCH 11/45] Add new setting for final output directory for special installations --- Orbitersdk/samples/ProjectApollo/CMakeLists.txt | 12 +++++++++--- .../Project/ApolloRTCCMFD/CMakeLists.txt | 2 +- .../samples/ProjectApollo/Project/MCC/CMakeLists.txt | 2 +- .../Project/ProjectApolloConfigurator/CMakeLists.txt | 2 +- .../Project/ProjectApolloMFD/CMakeLists.txt | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index cd271d46d4..fce6debe01 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -16,7 +16,13 @@ option(OPENORBITER OFF) # 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 ${CMAKE_SOURCE_DIR}/../../../ CACHE STRING "Location of OpenOrbiter installation directory") +set(ORBITER_INSTALL_DIR ./../../../ CACHE STRING "Location of OpenOrbiter installation directory") + +# 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(CMAKE_SIZEOF_VOID_P EQUAL 8) # 64-bit build? set(BUILD64 1) @@ -49,11 +55,11 @@ set(ORBITERSDK_DIR ${ORBITER_INSTALL_DIR}/Orbitersdk) set(NASSP_SOURCE_ROOT ${CMAKE_SOURCE_DIR}) # Set project libraries to output their DLL files and debug info to -# the Orbiter installation's "Modules/ProjectApollo" directory, +# 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 ${ORBITER_INSTALL_DIR}/Modules/ProjectApollo) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/ProjectApollo) # Sub-projects are what actually build all our vessels, MFDs, etc. add_subdirectory(Project/PanelSDK) diff --git a/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt index 6a1b09581b..62c0ced7cb 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt @@ -48,7 +48,7 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${ORBITER_INSTALL_DIR}/Modules/Plugin) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/Plugin) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) diff --git a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt index 7d2a2db66b..7045f7254b 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt @@ -63,7 +63,7 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${ORBITER_INSTALL_DIR}/Modules/ProjectApollo) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/ProjectApollo) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) diff --git a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt index dc80a66df6..6d423706c8 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt @@ -12,7 +12,7 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${ORBITER_INSTALL_DIR}/Modules/Startup) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/Startup) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_sources(ProjectApolloConfigurator PRIVATE ${NASSP_SOURCE_ROOT}/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.rc) diff --git a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt index d37aa4e0fd..aeae346342 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt @@ -23,7 +23,7 @@ set(SOURCES link_directories(${ORBITERSDK_DIR}/lib) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${ORBITER_INSTALL_DIR}/Modules/Plugin) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/Plugin) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_sources(ProjectApolloMFD PRIVATE ${NASSP_SOURCE_ROOT}/src_mfd/MFDResources.rc) From 072f4744f67e2e5b073447baf37dd0891edf25f6 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Wed, 31 Jul 2024 12:27:46 -0700 Subject: [PATCH 12/45] Configure config/data file auto-copying --- .../samples/ProjectApollo/CMakeLists.txt | 59 ++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index fce6debe01..dbc0115960 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -38,6 +38,7 @@ if (NOT ${CMAKE_GENERATOR} STREQUAL "Ninja") add_compile_options(/MP) 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") @@ -96,4 +97,60 @@ add_subdirectory(Project/sii) add_subdirectory(Project/SIVB) add_subdirectory(Project/Skylab) add_subdirectory(Project/sm) -add_subdirectory(Project/VAB) \ No newline at end of file +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. +set(NASSP_REPO_ROOT ${NASSP_SOURCE_ROOT}/../../..) +if(${NASSP_REPO_ROOT} STREQUAL ${ORBITER_INSTALL_DIR}) + message("[NASSP] Refusing to copy config files, NASSP is cloned directly into an Orbiter installation.") +else() + message("[NASSP] Copying config/data files to final destination directory, please wait...") + + # Create the list of input directories to be copied to the install location + set(NASSP_INSTALL_DIR_LIST + "Config" + "Doc" + "Html" + "Meshes" + "Scenarios" + "Script" + "Sound" + "Textures" + "XRSound" + ) + + foreach(dir ${NASSP_INSTALL_DIR_LIST}) + # Create the top-level folders. + #message("[NASSP] Making directory: ${FINAL_INSTALL_DIR}/${dir}") + file(MAKE_DIRECTORY ${FINAL_INSTALL_DIR}/${dir}) + + # Recursively grab a list of directories/files. + file(GLOB_RECURSE DIRECTORIES_TO_COPY LIST_DIRECTORIES true ${NASSP_REPO_ROOT}/${dir}/*) + + # First pass, create only the entries which are directories, in the output destination. + foreach(entry ${DIRECTORIES_TO_COPY}) + if(IS_DIRECTORY ${entry}) + file(RELATIVE_PATH nested_dir ${NASSP_REPO_ROOT} ${entry}) + #message("[NASSP] Making subdirectory: ${FINAL_INSTALL_DIR}/${nested_dir}") + file(MAKE_DIRECTORY ${FINAL_INSTALL_DIR}/${nested_dir}) + endif() + endforeach() + + # Second pass, now copy the files. + foreach(entry ${DIRECTORIES_TO_COPY}) + if(NOT IS_DIRECTORY ${entry}) + file(RELATIVE_PATH file ${NASSP_REPO_ROOT} ${entry}) + #message("[NASSP] Copying file: ${FINAL_INSTALL_DIR}/${file}") + file(COPY_FILE ${entry} ${FINAL_INSTALL_DIR}/${file} ONLY_IF_DIFFERENT) + endif() + endforeach() + endforeach() + + message("[NASSP] Copying completed!") +endif() From 12678b68fa207294e88223759e3203e6140809cd Mon Sep 17 00:00:00 2001 From: James Pelster Date: Wed, 31 Jul 2024 12:38:00 -0700 Subject: [PATCH 13/45] Add extra check for final dir == repo root before copying --- Orbitersdk/samples/ProjectApollo/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index dbc0115960..806b35ae82 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -109,6 +109,8 @@ add_subdirectory(Project/VAB) set(NASSP_REPO_ROOT ${NASSP_SOURCE_ROOT}/../../..) 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, please wait...") From cce0a4dc5dc8733ac0995199f46058e4a262c94e Mon Sep 17 00:00:00 2001 From: James Pelster Date: Thu, 1 Aug 2024 09:47:00 -0700 Subject: [PATCH 14/45] Clarify copy variable name, fix NASSP-inside-Orbiter-dir detection --- Orbitersdk/samples/ProjectApollo/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index 806b35ae82..3b9e3774dc 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -106,7 +106,7 @@ add_subdirectory(Project/VAB) # 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. -set(NASSP_REPO_ROOT ${NASSP_SOURCE_ROOT}/../../..) +set(NASSP_REPO_ROOT ./../../../) 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}) @@ -133,10 +133,10 @@ else() file(MAKE_DIRECTORY ${FINAL_INSTALL_DIR}/${dir}) # Recursively grab a list of directories/files. - file(GLOB_RECURSE DIRECTORIES_TO_COPY LIST_DIRECTORIES true ${NASSP_REPO_ROOT}/${dir}/*) + file(GLOB_RECURSE STUFF_TO_COPY LIST_DIRECTORIES true ${NASSP_REPO_ROOT}/${dir}/*) # First pass, create only the entries which are directories, in the output destination. - foreach(entry ${DIRECTORIES_TO_COPY}) + foreach(entry ${STUFF_TO_COPY}) if(IS_DIRECTORY ${entry}) file(RELATIVE_PATH nested_dir ${NASSP_REPO_ROOT} ${entry}) #message("[NASSP] Making subdirectory: ${FINAL_INSTALL_DIR}/${nested_dir}") @@ -145,7 +145,7 @@ else() endforeach() # Second pass, now copy the files. - foreach(entry ${DIRECTORIES_TO_COPY}) + foreach(entry ${STUFF_TO_COPY}) if(NOT IS_DIRECTORY ${entry}) file(RELATIVE_PATH file ${NASSP_REPO_ROOT} ${entry}) #message("[NASSP] Copying file: ${FINAL_INSTALL_DIR}/${file}") From 06aabc439e0a0d6ae44b1d7e44f60241aa4bd291 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Thu, 1 Aug 2024 10:13:05 -0700 Subject: [PATCH 15/45] Reorganize main CMakeLists file --- .../samples/ProjectApollo/CMakeLists.txt | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index 3b9e3774dc..cad040a253 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -3,27 +3,10 @@ cmake_minimum_required(VERSION 3.19) # Set the project name project(NASSP VERSION 8.0.3) +# Set C++ compiler variables set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -option(OPENORBITER OFF) - -#Add /permissive if using C++20 or higher -#add_compile_options(/permissive) - -# Group projects in VS -#set_property(GLOBAL PROPERTY USE_FOLDERS ON) - -# 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 ./../../../ CACHE STRING "Location of OpenOrbiter installation directory") - -# 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(CMAKE_SIZEOF_VOID_P EQUAL 8) # 64-bit build? set(BUILD64 1) set(ARCH "x64") @@ -51,9 +34,27 @@ if(MSVC) add_link_options("/NODEFAULTLIB:LIBCMTD") endif() -# Set project-wide variables +#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(ORBITERSDK_DIR ${ORBITER_INSTALL_DIR}/Orbitersdk) set(NASSP_SOURCE_ROOT ${CMAKE_SOURCE_DIR}) +set(NASSP_REPO_ROOT ${NASSP_SOURCE_ROOT}/../../../) +option(OPENORBITER OFF) + +# 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") + +# 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") # Set project libraries to output their DLL files and debug info to # the final installation dir's "Modules/ProjectApollo" directory, @@ -106,7 +107,6 @@ add_subdirectory(Project/VAB) # 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. -set(NASSP_REPO_ROOT ./../../../) 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}) From 43c0a0c60aaeb7a564ac0d2a09ad0987a49c95d2 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Tue, 6 Aug 2024 11:50:57 -0700 Subject: [PATCH 16/45] Message the final install dir when copying --- Orbitersdk/samples/ProjectApollo/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index cad040a253..81a8ae9a62 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -113,6 +113,7 @@ 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, please wait...") + 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 From 1a789f4217079d4a4e216968b6ec43cc70cfe05d Mon Sep 17 00:00:00 2001 From: James Pelster Date: Fri, 9 Aug 2024 12:15:40 -0700 Subject: [PATCH 17/45] Consolidate target_link_libraries() statements in projects --- .../ProjectApollo/Project/ASTP/CMakeLists.txt | 8 +++-- .../Project/ApolloRTCCMFD/CMakeLists.txt | 10 ++++--- .../Project/CMChute/CMakeLists.txt | 6 ++-- .../Project/Crawler/CMakeLists.txt | 8 +++-- .../ProjectApollo/Project/EVA/CMakeLists.txt | 6 ++-- .../Project/FloatBag/CMakeLists.txt | 6 ++-- .../Project/Floodlight/CMakeLists.txt | 8 +++-- .../ProjectApollo/Project/LC34/CMakeLists.txt | 8 +++-- .../ProjectApollo/Project/LC37/CMakeLists.txt | 8 +++-- .../ProjectApollo/Project/LCC/CMakeLists.txt | 6 ++-- .../ProjectApollo/Project/LEM/CMakeLists.txt | 24 ++++++++------- .../ProjectApollo/Project/LES/CMakeLists.txt | 6 ++-- .../ProjectApollo/Project/LEVA/CMakeLists.txt | 8 +++-- .../ProjectApollo/Project/LRV/CMakeLists.txt | 8 +++-- .../ProjectApollo/Project/MCC/CMakeLists.txt | 10 ++++--- .../ProjectApollo/Project/ML/CMakeLists.txt | 8 +++-- .../ProjectApollo/Project/MSS/CMakeLists.txt | 8 +++-- .../Project/PanelSDK/CMakeLists.txt | 8 +++-- .../ProjectApolloConfigurator/CMakeLists.txt | 16 +++++----- .../Project/ProjectApolloMFD/CMakeLists.txt | 12 ++++---- .../ProjectApollo/Project/SIVB/CMakeLists.txt | 10 ++++--- .../Project/Sat1bAbort1/CMakeLists.txt | 10 ++++--- .../Project/Sat1bAbort2/CMakeLists.txt | 10 ++++--- .../Project/Sat5Abort1/CMakeLists.txt | 10 ++++--- .../Project/Sat5Abort2/CMakeLists.txt | 10 ++++--- .../Project/Sat5Abort3/CMakeLists.txt | 10 ++++--- .../Project/Sat5LMDSC/CMakeLists.txt | 10 ++++--- .../Project/Saturn1B/CMakeLists.txt | 30 ++++++++++--------- .../Project/Saturn5/CMakeLists.txt | 30 ++++++++++--------- .../Project/Skylab/CMakeLists.txt | 10 ++++--- .../ProjectApollo/Project/VAB/CMakeLists.txt | 8 +++-- .../ProjectApollo/Project/s1b/CMakeLists.txt | 10 ++++--- .../ProjectApollo/Project/s1c/CMakeLists.txt | 10 ++++--- .../ProjectApollo/Project/sii/CMakeLists.txt | 10 ++++--- .../ProjectApollo/Project/sm/CMakeLists.txt | 10 ++++--- 35 files changed, 220 insertions(+), 150 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt index 0508b6cfdc..c6e3c10026 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt @@ -17,6 +17,8 @@ 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} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) \ No newline at end of file +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 index 62c0ced7cb..cc911b2681 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt @@ -52,7 +52,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/Plugin) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} WinMM) -target_link_libraries(${PROJECT_NAME} WS2_32) \ No newline at end of file +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 index 60ae27642b..689db7cb37 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/CMChute/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/CMChute/CMakeLists.txt @@ -15,5 +15,7 @@ link_directories(${ORBITERSDK_DIR}/lib) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) \ No newline at end of file +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 index e4c3bbf644..e0257cde36 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Crawler/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Crawler/CMakeLists.txt @@ -21,6 +21,8 @@ link_directories(${ORBITERSDK_DIR}/XRSound) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index 880e00c56c..6ed678976f 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/EVA/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/EVA/CMakeLists.txt @@ -15,5 +15,7 @@ link_directories(${ORBITERSDK_DIR}/lib) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) \ No newline at end of file +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 index e5d8f54480..8e91e35c28 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/FloatBag/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/FloatBag/CMakeLists.txt @@ -15,5 +15,7 @@ link_directories(${ORBITERSDK_DIR}/lib) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) \ No newline at end of file +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 index 038e583eb3..026266713b 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Floodlight/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Floodlight/CMakeLists.txt @@ -19,6 +19,8 @@ link_directories(${ORBITERSDK_DIR}/XRSound) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index 8e5af0c73a..a4828afd7b 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/LC34/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/LC34/CMakeLists.txt @@ -28,6 +28,8 @@ link_directories(${ORBITERSDK_DIR}/XRSound) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index 29bff2fab6..941b91f555 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/LC37/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/LC37/CMakeLists.txt @@ -29,6 +29,8 @@ link_directories(${ORBITERSDK_DIR}/XRSound) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index 928768d194..f0d51c1e4a 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/LCC/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/LCC/CMakeLists.txt @@ -20,5 +20,7 @@ link_directories(${ORBITERSDK_DIR}/lib) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) \ No newline at end of file +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 index cd3b0b7cee..c675bf205f 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/LEM/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/LEM/CMakeLists.txt @@ -96,14 +96,16 @@ 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} GLU32) -target_link_libraries(${PROJECT_NAME} dxguid) -target_link_libraries(${PROJECT_NAME} dinput8) -target_link_libraries(${PROJECT_NAME} OpenGL32) -target_link_libraries(${PROJECT_NAME} User32) -target_link_libraries(${PROJECT_NAME} WinMM) -target_link_libraries(${PROJECT_NAME} WS2_32) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index 1c8ff3243e..4e74318d07 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/LES/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/LES/CMakeLists.txt @@ -14,5 +14,7 @@ link_directories(${ORBITERSDK_DIR}/lib) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) \ No newline at end of file +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 index 2f88c980b9..6bcfbbe100 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/LEVA/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/LEVA/CMakeLists.txt @@ -23,6 +23,8 @@ link_directories(${ORBITERSDK_DIR}/XRSound) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index f401092bca..d920010c95 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/LRV/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/LRV/CMakeLists.txt @@ -23,6 +23,8 @@ link_directories(${ORBITERSDK_DIR}/XRSound) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index 7045f7254b..d952a81a7a 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt @@ -67,7 +67,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/ProjectApollo) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} WinMM) -target_link_libraries(${PROJECT_NAME} WS2_32) \ No newline at end of file +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + WinMM + WS2_32 +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt index 00ad54f3ea..1b9c7c129b 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt @@ -31,6 +31,8 @@ link_directories(${ORBITERSDK_DIR}/XRSound) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index ea88cfef96..9a65a1b23e 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/MSS/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/MSS/CMakeLists.txt @@ -21,6 +21,8 @@ link_directories(${ORBITERSDK_DIR}/XRSound) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index e136330eb5..0baefc4799 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/PanelSDK/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/PanelSDK/CMakeLists.txt @@ -24,6 +24,8 @@ link_directories(${ORBITERSDK_DIR}/XRSound) add_library(${PROJECT_NAME} STATIC ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index 6d423706c8..2f06641837 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt @@ -17,10 +17,12 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${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} dxguid) -target_link_libraries(${PROJECT_NAME} dinput8) -target_link_libraries(${PROJECT_NAME} GLU32) -target_link_libraries(${PROJECT_NAME} User32) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} OpenGL32) \ No newline at end of file +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 index aeae346342..094278c78c 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt @@ -28,8 +28,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${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} User32) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} WinMM) -target_link_libraries(${PROJECT_NAME} WS2_32) \ No newline at end of file +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 index ed4c4470fa..7c1b78937e 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/SIVB/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/SIVB/CMakeLists.txt @@ -39,7 +39,9 @@ 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} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index e0c42a3479..3359998979 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort1/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort1/CMakeLists.txt @@ -21,7 +21,9 @@ 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} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index 0f98523b39..6eb7a974ff 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort2/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort2/CMakeLists.txt @@ -21,7 +21,9 @@ 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} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index 33989d989e..48b15f1aca 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort1/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort1/CMakeLists.txt @@ -21,7 +21,9 @@ 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} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index 91dd0ffc9c..51430e0d21 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort2/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort2/CMakeLists.txt @@ -21,7 +21,9 @@ 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} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index ac3f7282f1..478d759e86 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort3/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort3/CMakeLists.txt @@ -23,7 +23,9 @@ 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} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index e650dd3986..9c3f09bb85 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Sat5LMDSC/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5LMDSC/CMakeLists.txt @@ -23,7 +23,9 @@ 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} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index d6e30860ee..bdf134ffbb 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt @@ -112,19 +112,21 @@ 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} GLU32) -target_link_libraries(${PROJECT_NAME} dxguid) -target_link_libraries(${PROJECT_NAME} dinput8) -target_link_libraries(${PROJECT_NAME} OpenGL32) -target_link_libraries(${PROJECT_NAME} User32) -target_link_libraries(${PROJECT_NAME} WinMM) -target_link_libraries(${PROJECT_NAME} WS2_32) +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} lua) + target_link_libraries(${PROJECT_NAME} PRIVATE lua) else() - target_link_libraries(${PROJECT_NAME} lua5.1) -endif() -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file + 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 index 7a81985667..2e99558f4b 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt @@ -111,19 +111,21 @@ 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} GLU32) -target_link_libraries(${PROJECT_NAME} dxguid) -target_link_libraries(${PROJECT_NAME} dinput8) -target_link_libraries(${PROJECT_NAME} OpenGL32) -target_link_libraries(${PROJECT_NAME} User32) -target_link_libraries(${PROJECT_NAME} WinMM) -target_link_libraries(${PROJECT_NAME} WS2_32) +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} lua) + target_link_libraries(${PROJECT_NAME} PRIVATE lua) else() - target_link_libraries(${PROJECT_NAME} lua5.1) -endif() -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file + 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 index bc0e61aca3..4251bd1f3e 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/Skylab/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/Skylab/CMakeLists.txt @@ -28,7 +28,9 @@ 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} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index fcd112ef7a..906e4d7711 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/VAB/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/VAB/CMakeLists.txt @@ -22,6 +22,8 @@ link_directories(${ORBITERSDK_DIR}/XRSound) add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index 0ab600f7dc..c6d9b3d080 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/s1b/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/s1b/CMakeLists.txt @@ -25,7 +25,9 @@ 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} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index 82cc3baf52..e75e73d10d 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/s1c/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/s1c/CMakeLists.txt @@ -24,7 +24,9 @@ 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} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index 2d76920f60..ff901f7033 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/sii/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/sii/CMakeLists.txt @@ -21,7 +21,9 @@ 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} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +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 index f42cb7d50b..2223762531 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/sm/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/sm/CMakeLists.txt @@ -21,7 +21,9 @@ 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} Orbiter) -target_link_libraries(${PROJECT_NAME} Orbitersdk) -target_link_libraries(${PROJECT_NAME} PanelSDK) -target_link_libraries(${PROJECT_NAME} XRSound) \ No newline at end of file +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file From 79d158be1c2da4188b43477e2af7f4a54f6fd459 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Fri, 9 Aug 2024 13:49:18 -0700 Subject: [PATCH 18/45] Vastly simplify install step, only copy data files when explicitly running "Install" --- .../samples/ProjectApollo/CMakeLists.txt | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index 81a8ae9a62..3a50a6b0af 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -112,7 +112,7 @@ if(${NASSP_REPO_ROOT} STREQUAL ${ORBITER_INSTALL_DIR}) 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, please wait...") + 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 @@ -129,31 +129,7 @@ else() ) foreach(dir ${NASSP_INSTALL_DIR_LIST}) - # Create the top-level folders. - #message("[NASSP] Making directory: ${FINAL_INSTALL_DIR}/${dir}") - file(MAKE_DIRECTORY ${FINAL_INSTALL_DIR}/${dir}) - - # Recursively grab a list of directories/files. - file(GLOB_RECURSE STUFF_TO_COPY LIST_DIRECTORIES true ${NASSP_REPO_ROOT}/${dir}/*) - - # First pass, create only the entries which are directories, in the output destination. - foreach(entry ${STUFF_TO_COPY}) - if(IS_DIRECTORY ${entry}) - file(RELATIVE_PATH nested_dir ${NASSP_REPO_ROOT} ${entry}) - #message("[NASSP] Making subdirectory: ${FINAL_INSTALL_DIR}/${nested_dir}") - file(MAKE_DIRECTORY ${FINAL_INSTALL_DIR}/${nested_dir}) - endif() - endforeach() - - # Second pass, now copy the files. - foreach(entry ${STUFF_TO_COPY}) - if(NOT IS_DIRECTORY ${entry}) - file(RELATIVE_PATH file ${NASSP_REPO_ROOT} ${entry}) - #message("[NASSP] Copying file: ${FINAL_INSTALL_DIR}/${file}") - file(COPY_FILE ${entry} ${FINAL_INSTALL_DIR}/${file} ONLY_IF_DIFFERENT) - endif() - endforeach() + file(TO_CMAKE_PATH ${FINAL_INSTALL_DIR} destination_fixed) + install(DIRECTORY ${NASSP_REPO_ROOT}/${dir} DESTINATION ${destination_fixed}) endforeach() - - message("[NASSP] Copying completed!") endif() From 6997477c433bf2c352c3911902b62f3bd2b84ab7 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Fri, 9 Aug 2024 14:19:19 -0700 Subject: [PATCH 19/45] Enable auto-detection of OpenOrbiter, optimize install step slightly --- Orbitersdk/samples/ProjectApollo/CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index 3a50a6b0af..1b6e2d0112 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -44,7 +44,13 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) set(ORBITERSDK_DIR ${ORBITER_INSTALL_DIR}/Orbitersdk) set(NASSP_SOURCE_ROOT ${CMAKE_SOURCE_DIR}) set(NASSP_REPO_ROOT ${NASSP_SOURCE_ROOT}/../../../) -option(OPENORBITER OFF) +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() # Check if the user has specified a non-default Orbiter installation location. # If not, use the default and alert the user. @@ -127,9 +133,9 @@ else() "Textures" "XRSound" ) - + + file(TO_CMAKE_PATH ${FINAL_INSTALL_DIR} destination_fixed) foreach(dir ${NASSP_INSTALL_DIR_LIST}) - file(TO_CMAKE_PATH ${FINAL_INSTALL_DIR} destination_fixed) install(DIRECTORY ${NASSP_REPO_ROOT}/${dir} DESTINATION ${destination_fixed}) endforeach() endif() From 81df97f39cd5d6480314d3246549a1d3d7f409e8 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Fri, 9 Aug 2024 16:20:26 -0700 Subject: [PATCH 20/45] Move MSVC compiler settings to after OpenOrbiter flag definition --- .../samples/ProjectApollo/CMakeLists.txt | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index 1b6e2d0112..4a50daa48a 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -21,19 +21,6 @@ if (NOT ${CMAKE_GENERATOR} STREQUAL "Ninja") add_compile_options(/MP) 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() - #Add /permissive if using C++20 or higher #add_compile_options(/permissive) @@ -52,6 +39,19 @@ else() 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() + # 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") From c8a3237dadddc1170d0087bc7f666b2884f6aa37 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Fri, 9 Aug 2024 16:33:44 -0700 Subject: [PATCH 21/45] Fix arrangement of Orbiter install dir and final install dir variables --- .../samples/ProjectApollo/CMakeLists.txt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index 4a50daa48a..51472f2fcb 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -27,6 +27,16 @@ endif() # Group projects in VS set_property(GLOBAL PROPERTY USE_FOLDERS ON) +# 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") + +# 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") + # Set NASSP-related variables set(ORBITERSDK_DIR ${ORBITER_INSTALL_DIR}/Orbitersdk) set(NASSP_SOURCE_ROOT ${CMAKE_SOURCE_DIR}) @@ -52,16 +62,6 @@ if(MSVC) add_link_options("/NODEFAULTLIB:LIBCMTD") endif() -# 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") - -# 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") - # 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, From 01d2cf1de951d0f9d06db4fdec2a4589ccd684eb Mon Sep 17 00:00:00 2001 From: James Pelster Date: Mon, 19 Aug 2024 14:46:48 -0700 Subject: [PATCH 22/45] Actually fix variable ordering this time --- Orbitersdk/samples/ProjectApollo/CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index 51472f2fcb..d283e73c04 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -27,9 +27,14 @@ endif() # 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 @@ -37,10 +42,6 @@ set(ORBITER_INSTALL_DIR ${NASSP_REPO_ROOT} CACHE STRING "Location of OpenOrbiter # 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") -# Set NASSP-related variables -set(ORBITERSDK_DIR ${ORBITER_INSTALL_DIR}/Orbitersdk) -set(NASSP_SOURCE_ROOT ${CMAKE_SOURCE_DIR}) -set(NASSP_REPO_ROOT ${NASSP_SOURCE_ROOT}/../../../) if(EXISTS ${ORBITER_INSTALL_DIR}/lua.dll) set(OPENORBITER ON) message("[NASSP] Configured for OpenOrbiter build.") From c09452c0603814dc035c836ee8e0d657584ef8c3 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Wed, 11 Sep 2024 22:56:34 -0700 Subject: [PATCH 23/45] Copy Missions folder during Install step --- Orbitersdk/samples/ProjectApollo/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index d283e73c04..bf6c9c68c5 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -128,6 +128,7 @@ else() "Doc" "Html" "Meshes" + "Missions" "Scenarios" "Script" "Sound" From a76789523bbb3e20e07f4dab4455b2c90e6531b2 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Wed, 25 Sep 2024 12:44:37 -0700 Subject: [PATCH 24/45] Fix oapiWriteLogError macro usage in Hsysparse --- .../ProjectApollo/src_sys/PanelSDK/Internals/Hsysparse.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 7e96749d3ec6bcd3efb47e7c4d80a6d06354c86c Mon Sep 17 00:00:00 2001 From: James Pelster Date: Mon, 4 Nov 2024 16:38:36 -0800 Subject: [PATCH 25/45] Add Mission source to MCC project --- Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt index d952a81a7a..ed7663740b 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt @@ -12,6 +12,7 @@ set(INCLUDE_DIRS ${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 From 10a2805a366403009c7417359ac773bc03544be9 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Wed, 1 Jan 2025 11:22:17 -0800 Subject: [PATCH 26/45] Enable new lunar gravity model & RTCC support for it --- Config/ProjectApollo/Moon.cfg | 7 ++++++- .../samples/ProjectApollo/src_rtccmfd/EnckeIntegrator.cpp | 2 +- .../ProjectApollo/src_rtccmfd/RTCCSystemParameters.h | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Config/ProjectApollo/Moon.cfg b/Config/ProjectApollo/Moon.cfg index 802dd5943a..78f81d092c 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/Technotes/gravity.pdf for details on implimentation and usage +GravModelPath = jgl165p1.sha ; the name of the gravity model file to load, located in /GravityModels +GravCoeffCutoff = 120 ; the maximum number of terms to load. +;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 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; From 9a5a93e2122f50d9ba91983671288813f57295e4 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Wed, 1 Jan 2025 11:38:05 -0800 Subject: [PATCH 27/45] Use R2 padload values for the AGC where applicable --- Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn | 8 ++++---- Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn | 8 ++++---- Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn | 8 ++++---- .../WIP Scenarios/Apollo 13 - Launch and Landing.scn | 8 ++++---- .../WIP Scenarios/Apollo 13 - Launch.scn | 8 ++++---- .../WIP Scenarios/Apollo 14 - Launch.scn | 8 ++++---- .../WIP Scenarios/Apollo 15 - Launch.scn | 8 ++++---- .../WIP Scenarios/Apollo 16 - Launch.scn | 8 ++++---- .../WIP Scenarios/Apollo 17 - Launch.scn | 8 ++++---- 9 files changed, 36 insertions(+), 36 deletions(-) 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/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 From 50e26eeeeb090c1ac3a6687a5d2129b78f957eab Mon Sep 17 00:00:00 2001 From: James Pelster Date: Wed, 1 Jan 2025 12:00:14 -0800 Subject: [PATCH 28/45] Enable new Earth gravity model & RTCC support for it --- Config/ProjectApollo/Earth.cfg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Config/ProjectApollo/Earth.cfg b/Config/ProjectApollo/Earth.cfg index d3571a44b6..73e7907529 100644 --- a/Config/ProjectApollo/Earth.cfg +++ b/Config/ProjectApollo/Earth.cfg @@ -13,6 +13,11 @@ 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, 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 PrecessionLAN = 0 ; [rad] From f02758ebce621849a39605d4f944de68ed7b660f Mon Sep 17 00:00:00 2001 From: James Pelster Date: Wed, 1 Jan 2025 12:18:08 -0800 Subject: [PATCH 29/45] Disable 32-bit-only moons While Orbiter 2024 only fully supports 32-bit compilation, 64-bit is an alternate option that is offered and some people may wish to use it. To accommodate this, we will disable the celestial bodies which only exist as closed-source, 32-bit libraries, because they cause havoc with orbits and vessel trajectories when using the 64-bit version of Orbiter 2024. Disabling these only affects NASSP flights, and it will not impact optical sightings because none ever use the moons of the various other planets (nor do the optics have the capability to see them, in all honesty). --- Config/ProjectApollo/Sol.cfg | 20 ++++++++++---------- Config/ProjectApollo/Sol_VirtualAGC.cfg | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Config/ProjectApollo/Sol.cfg b/Config/ProjectApollo/Sol.cfg index c6fd13e33a..ec83efc1de 100644 --- a/Config/ProjectApollo/Sol.cfg +++ b/Config/ProjectApollo/Sol.cfg @@ -7,8 +7,8 @@ Planet2 = Venus Planet3 = ProjectApollo\Earth Earth:Moon1 = ProjectApollo\Moon Planet4 = Mars -Mars:Moon1 = Phobos -Mars:Moon2 = Deimos +;Mars:Moon1 = Phobos +;Mars:Moon2 = Deimos Planet5 = Jupiter Jupiter:Moon1 = Io Jupiter:Moon2 = Europa @@ -22,12 +22,12 @@ Saturn:Moon4 = Dione Saturn:Moon5 = Rhea Saturn:Moon6 = Titan Planet7 = Uranus -Uranus:Moon1 = Miranda -Uranus:Moon2 = Ariel -Uranus:Moon3 = Umbriel -Uranus:Moon4 = Titania -Uranus:Moon5 = Oberon +;Uranus:Moon1 = Miranda +;Uranus:Moon2 = Ariel +;Uranus:Moon3 = Umbriel +;Uranus:Moon4 = Titania +;Uranus:Moon5 = Oberon Planet8 = Neptune -Neptune:Moon1 = Triton -Neptune:Moon2 = Proteus -Neptune:Moon3 = Nereid \ No newline at end of file +;Neptune:Moon1 = Triton +;Neptune:Moon2 = Proteus +;Neptune:Moon3 = Nereid \ No newline at end of file diff --git a/Config/ProjectApollo/Sol_VirtualAGC.cfg b/Config/ProjectApollo/Sol_VirtualAGC.cfg index d04b4dee43..29f66ea6e7 100644 --- a/Config/ProjectApollo/Sol_VirtualAGC.cfg +++ b/Config/ProjectApollo/Sol_VirtualAGC.cfg @@ -7,8 +7,8 @@ Planet2 = Venus Planet3 = ProjectApollo\Earth_VirtualAGC Earth:Moon1 = ProjectApollo\Moon Planet4 = Mars -Mars:Moon1 = Phobos -Mars:Moon2 = Deimos +;Mars:Moon1 = Phobos +;Mars:Moon2 = Deimos Planet5 = Jupiter Jupiter:Moon1 = Io Jupiter:Moon2 = Europa @@ -22,12 +22,12 @@ Saturn:Moon4 = Dione Saturn:Moon5 = Rhea Saturn:Moon6 = Titan Planet7 = Uranus -Uranus:Moon1 = Miranda -Uranus:Moon2 = Ariel -Uranus:Moon3 = Umbriel -Uranus:Moon4 = Titania -Uranus:Moon5 = Oberon +;Uranus:Moon1 = Miranda +;Uranus:Moon2 = Ariel +;Uranus:Moon3 = Umbriel +;Uranus:Moon4 = Titania +;Uranus:Moon5 = Oberon Planet8 = Neptune -Neptune:Moon1 = Triton -Neptune:Moon2 = Proteus -Neptune:Moon3 = Nereid \ No newline at end of file +;Neptune:Moon1 = Triton +;Neptune:Moon2 = Proteus +;Neptune:Moon3 = Nereid \ No newline at end of file From eb9084a554cf2104aa6ec2afe3682e0912b8a78c Mon Sep 17 00:00:00 2001 From: James Pelster Date: Wed, 1 Jan 2025 16:07:44 -0800 Subject: [PATCH 30/45] Update Moon config to latest visual settings / comments --- Config/ProjectApollo/Moon.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Config/ProjectApollo/Moon.cfg b/Config/ProjectApollo/Moon.cfg index 78f81d092c..f68fb0e465 100644 --- a/Config/ProjectApollo/Moon.cfg +++ b/Config/ProjectApollo/Moon.cfg @@ -8,7 +8,7 @@ Mass = 7.34763862e+22 ; reverse calculated with Orbiter's gravitation Size = 1.73809e6 ; mean radius ; === Gravity Models === -; ref: see Doc/Technotes/gravity.pdf for details on implimentation and usage +; 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. @@ -36,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 From 851a607364b91a47f1556456d489361ea927b692 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Wed, 1 Jan 2025 16:08:45 -0800 Subject: [PATCH 31/45] Update Earth config to latest parameters Turns out the Earth.cfg file isn't used in modern scenarios, it's the Earth_VirtualAGC file we need to modify! --- Config/ProjectApollo/Earth_VirtualAGC.cfg | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) 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 === From e1a4583cb2066990e0ce8287bd4b91d74482b7df Mon Sep 17 00:00:00 2001 From: James Pelster Date: Wed, 1 Jan 2025 16:10:52 -0800 Subject: [PATCH 32/45] Remove legacy Earth.cfg and Sol.cfg files These were only used by the "broken" NASSP 7 scenario holdovers, and they weren't being updated like the rest of our configs. Removing them makes it clear which files need to be changed, and probably improves the situation for the broken scenarios as far as solar system accuracy goes now that they're not using 10-year-old configs. --- Config/ProjectApollo/Earth.cfg | 87 --------- Config/ProjectApollo/Earth/Base/Canaveral.cfg | 184 ------------------ Config/ProjectApollo/Sol.cfg | 33 ---- .../Apollo 4 - Launch.scn | 2 +- .../Apollo 6 - Launch.scn | 2 +- .../AAP-1a Earth Resources mission.scn | 2 +- .../AAP-Saturn 1B - Launch.scn | 2 +- .../AAP-Saturn V - Launch.scn | 2 +- .../Apollo to Venus Orbital Test.scn | 2 +- ... flight approaching orbit-raising burn.scn | 2 +- .../Fictional Missions/Moonlab.scn | 2 +- .../Random Failures Test Launch.scn | 2 +- .../Reference Missions/DRM-64.scn | 2 +- .../Fictional Missions/Saturn 1b Skylab.scn | 2 +- .../Saturn 5 INT 20 launch.scn | 2 +- 15 files changed, 12 insertions(+), 316 deletions(-) delete mode 100644 Config/ProjectApollo/Earth.cfg delete mode 100644 Config/ProjectApollo/Earth/Base/Canaveral.cfg delete mode 100644 Config/ProjectApollo/Sol.cfg diff --git a/Config/ProjectApollo/Earth.cfg b/Config/ProjectApollo/Earth.cfg deleted file mode 100644 index 73e7907529..0000000000 --- a/Config/ProjectApollo/Earth.cfg +++ /dev/null @@ -1,87 +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 - -; === 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, 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 -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/Sol.cfg b/Config/ProjectApollo/Sol.cfg deleted file mode 100644 index ec83efc1de..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/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 From c11e202dce3484c3576cfe44df7ab544a449eee1 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Sat, 11 Jan 2025 17:51:25 -0800 Subject: [PATCH 33/45] Fix building with new MCC code --- Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt index ed7663740b..15a630ecf2 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt @@ -16,6 +16,7 @@ set(SOURCES ${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 @@ -73,4 +74,4 @@ target_link_libraries(${PROJECT_NAME} PRIVATE Orbitersdk WinMM WS2_32 -) \ No newline at end of file +) From e9977ee175fe4b2670f82e4865693e55a635ca38 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Tue, 14 Jan 2025 11:16:16 -0800 Subject: [PATCH 34/45] Add Flag vessel --- .../samples/ProjectApollo/CMakeLists.txt | 1 + .../ProjectApollo/Project/Flag/CMakeLists.txt | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 Orbitersdk/samples/ProjectApollo/Project/Flag/CMakeLists.txt diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index bf6c9c68c5..2b66b8e9dd 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -77,6 +77,7 @@ 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) 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 From d4b250c8749fabd02a207caaa05072d294bf0d0d Mon Sep 17 00:00:00 2001 From: James Pelster Date: Fri, 21 Feb 2025 13:02:14 -0800 Subject: [PATCH 35/45] Add GH Actions workflow for autobuilding Fix Orbiter dependency path Fix CMake source path, generator, and architecture More fixes and improvements to build workflow Even more fixes? Fixes pt 3 Final fix? Set GH token Fix and simplify release tagging Try and fix the per-config subdirectory added to the build output Add comment for buildbot workaround, fix release commit tagging Use PowerShell directly for downloading Orbiter release ZIP See if we can use multithreading for compilation Remove autobuild from PRs, look at CMake branch now --- .github/workflows/build.yml | 48 +++++++++++++++++++ .../samples/ProjectApollo/CMakeLists.txt | 5 ++ .../Project/ApolloRTCCMFD/CMakeLists.txt | 2 + .../ProjectApollo/Project/MCC/CMakeLists.txt | 1 + .../ProjectApolloConfigurator/CMakeLists.txt | 2 + .../Project/ProjectApolloMFD/CMakeLists.txt | 2 + 6 files changed, 60 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000000..4053c6c35f --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,48 @@ +# 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-Beta-Orbiter2024-x64-${{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: Download Orbiter 2024 x64 + 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}}.zip -Force + + - name: Create GitHub release and tag + run: gh release create ${{env.BUILD_NAME}} ${{github.workspace}}/${{env.BUILD_NAME}}.zip --target CMake \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index 2b66b8e9dd..b3d85b9d46 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -69,6 +69,11 @@ endif() # 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) diff --git a/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt index cc911b2681..e3bad44ca4 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt @@ -49,6 +49,8 @@ set(SOURCES 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}) diff --git a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt index 15a630ecf2..899aa79de0 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt @@ -66,6 +66,7 @@ set(SOURCES 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}) diff --git a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt index 2f06641837..14b259eb0f 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt @@ -13,6 +13,8 @@ set(SOURCES 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) diff --git a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt index 094278c78c..c6e2551a4e 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt @@ -24,6 +24,8 @@ set(SOURCES 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) From 9a43fd40dd80da53864a4fd3a75025f816bc6fb6 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Fri, 21 Feb 2025 15:47:56 -0800 Subject: [PATCH 36/45] Bump version number to 9.0 --- Orbitersdk/samples/ProjectApollo/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt index b3d85b9d46..017251d91e 100644 --- a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.19) # Set the project name -project(NASSP VERSION 8.0.3) +project(NASSP VERSION 9.0) # Set C++ compiler variables set(CMAKE_CXX_STANDARD 17) From 4eef5cff5fa46e410a9bc0d14c9bfbc73bcb1e65 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Fri, 21 Feb 2025 18:03:32 -0800 Subject: [PATCH 37/45] Remove Appveyor script --- appveyor.yml | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 appveyor.yml 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 From 22ec945d8a4d591c4f7c998338c2463e736f8a05 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Fri, 21 Feb 2025 18:03:54 -0800 Subject: [PATCH 38/45] Update contributing guideline file for Orbiter 2024 --- CONTRIBUTING.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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. From 5cd9d2165314b320793bb69851ef0dfd0130e6de Mon Sep 17 00:00:00 2001 From: James Pelster Date: Fri, 21 Feb 2025 18:04:15 -0800 Subject: [PATCH 39/45] Try and cache the Orbiter 2024 x64 zip file for the buildbot --- .github/workflows/build.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4053c6c35f..9f71031d5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,15 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Download Orbiter 2024 x64 + - 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 From b27c7924cf8eb872c851d0a04083599691839a5a Mon Sep 17 00:00:00 2001 From: James Pelster Date: Fri, 21 Feb 2025 19:12:07 -0800 Subject: [PATCH 40/45] Remove COPYING.txt since OpenOrbiter is free software --- COPYING.txt | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 COPYING.txt 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. From ba21ba6c1a359b53e5778f3cc8ccaa732df3982a Mon Sep 17 00:00:00 2001 From: James Pelster Date: Fri, 21 Feb 2025 19:33:31 -0800 Subject: [PATCH 41/45] Remove "beta" from build names, move "x64" to zip filename --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f71031d5b..7f4a748eec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ env: GH_TOKEN: ${{github.token}} # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: RelWithDebInfo - BUILD_NAME: NASSP-V9.0-Beta-Orbiter2024-x64-${{github.run_number}} + BUILD_NAME: NASSP-V9.0-Orbiter2024-${{github.run_number}} jobs: build: @@ -50,7 +50,7 @@ jobs: run: cmake --install ${{github.workspace}}/build - name: Zip output directory - run: Compress-Archive -Path ${{github.workspace}}/install/* -DestinationPath ${{github.workspace}}/${{env.BUILD_NAME}}.zip -Force + 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}}.zip --target CMake \ No newline at end of file + run: gh release create ${{env.BUILD_NAME}} ${{github.workspace}}/${{env.BUILD_NAME}}-x64.zip --target CMake \ No newline at end of file From 8649a522eb3c1966e2af45f17df74acaa74e3f54 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Fri, 21 Feb 2025 20:03:03 -0800 Subject: [PATCH 42/45] Update gitattributes to target the new build script --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f47d1a09064516fe1a9dfb28d2e367e1e7382610 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Fri, 21 Feb 2025 20:03:14 -0800 Subject: [PATCH 43/45] Update VS version recommendation in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, From 4787bf9f97e2801df3f09cc85b6a85669155aaa8 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Thu, 10 Apr 2025 15:13:18 -0700 Subject: [PATCH 44/45] Add Two-Impulse Processor code files to RTCC and MCC projects --- .../samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt | 1 + Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt index e3bad44ca4..85baaa2c13 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt @@ -43,6 +43,7 @@ set(SOURCES ${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 ) diff --git a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt index 899aa79de0..50accd11c7 100644 --- a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt +++ b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt @@ -60,6 +60,7 @@ set(SOURCES ${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 ) From 78ff8abe08c76d1cb07e9edf764d622b5cefa684 Mon Sep 17 00:00:00 2001 From: James Pelster Date: Fri, 31 Oct 2025 13:07:46 -0700 Subject: [PATCH 45/45] Fix DirectInput on x64 --- .../ProjectApolloConfigurator/ProjectApolloConfigurator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp index 567d51b39c..1e07d4ab2a 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp @@ -548,7 +548,7 @@ INT_PTR CALLBACK ProjectApolloConfigurator::DlgProcControl (HWND hWnd, UINT uMsg } 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, GWLP_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);