User can now select between building orbiter with dx7 inline client, …

…orbiter graphics server, or both
jarmonik · Jul 26, 2021 · 4f4e384 · 4f4e384
1 parent 3f542f2
commit 4f4e384
Show file tree

Hide file tree

Showing 91 changed files with 230 additions and 401 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,7 +49,6 @@ set(ORBITER_INSTALL_DOC_DIR ${ORBITER_INSTALL_ROOT_DIR}/Doc)
 set(ORBITER_INSTALL_UTILS_DIR ${ORBITER_INSTALL_ROOT_DIR}/Utils)
 set(ORBITER_INSTALL_SDK_DIR ${ORBITER_INSTALL_ROOT_DIR}/Orbitersdk)
 
-set(ORBITER_LIB $<TARGET_LINKER_FILE:Orbiter>)
 set(ORBITER_SDK_LIB $<TARGET_FILE:Orbitersdk>)
 set(ORBITER_DLGCTRL_LIB $<TARGET_FILE:DlgCtrl>)
 set(LUAINTERPRETER_LIB $<TARGET_LINKER_FILE:LuaInterpreter>)
@@ -116,6 +115,40 @@ file(TO_NATIVE_PATH "${PDFLATEX_COMPILER}" PDFTEX_PATH_W)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pdftex_fix.bat.in ${PDFTEX_CMD})
 
 
+# =====================================================================================
+
+set(OrbiterExe_graphics "Orbiter (built-in DX7 graphics engine)")
+set(OrbiterExe_ng "Orbiter (graphics server version)")
+set(OrbiterExe_both "Both (inline DX7 graphics + graphics server)")
+set(ORBITER_GRAPHICS
+	${OrbiterExe_both}
+	CACHE
+	STRING
+	"Orbiter executables to be built."
+)
+set_property(CACHE ORBITER_GRAPHICS
+	PROPERTY
+	STRINGS ${OrbiterExe_both} ${OrbiterExe_graphics} ${OrbiterExe_ng}
+)
+if(NOT ${ORBITER_GRAPHICS} STREQUAL ${OrbiterExe_ng})
+	set(BUILD_ORBITER_DX7 1)
+else()
+	set(BUILD_ORBITER_DX7 0)
+endif()
+if(NOT ${ORBITER_GRAPHICS} STREQUAL ${OrbiterExe_graphics})
+	set(BUILD_ORBITER_SERVER 1)
+else()
+	set(BUILD_ORBITER_SERVER 0)
+endif()
+
+if(BUILD_ORBITER_DX7)
+	set(OrbiterTgt Orbiter)
+	set(ORBITER_LIB $<TARGET_LINKER_FILE:Orbiter>)
+else()
+	set(OrbiterTgt Orbiter_server)
+	set(ORBITER_LIB $<TARGET_LINKER_FILE:Orbiter_server>)
+endif()
+
 # =====================================================================================
 # Configure Orbiter.cfg for externally installed planet textures
 
@@ -130,19 +163,22 @@ string(COMPARE NOTEQUAL ${ORBITER_PLANET_TEXTURE_INSTALL_DIR} "${ORBITER_BINARY_
 if (${CUSTOM_PLANET_TEXTURE_DIR})
 	string(REPLACE  "/" "\\" ORBITER_PLANET_TEXTURE_INSTALL_DIR_W "${ORBITER_PLANET_TEXTURE_INSTALL_DIR}")
 
-#	if(ORBITER_BUILD_WITH_DX7)
-#		set(root_cfg Orbiter.cfg)
-#	else()
-#		set(root_cfg Orbiter_NG.cfg)
-#	endif()
+	if(BUILD_ORBITER_DX7)
+		configure_file(${ORBITER_SOURCE_DIR}/Orbiter.cfg.in ${ORBITER_BINARY_ROOT_DIR}/Orbiter.cfg)
+		install(FILES
+			${ORBITER_BINARY_ROOT_DIR}/Orbiter.cfg
+			DESTINATION ${ORBITER_INSTALL_ROOT_DIR}
+		)
+	endif()
+
+	if(BUILD_ORBITER_SERVER)
+		configure_file(${ORBITER_SOURCE_DIR}/Orbiter.cfg.in ${ORBITER_BINARY_ROOT_DIR}/Orbiter_NG.cfg)
+		install(FILES
+			${ORBITER_BINARY_ROOT_DIR}/Orbiter_NG.cfg
+			DESTINATION ${ORBITER_INSTALL_ROOT_DIR}
+		)
+	endif()
 
-	configure_file(${ORBITER_SOURCE_DIR}/Orbiter.cfg.in ${ORBITER_BINARY_ROOT_DIR}/Orbiter.cfg)
-	configure_file(${ORBITER_SOURCE_DIR}/Orbiter.cfg.in ${ORBITER_BINARY_ROOT_DIR}/Orbiter_NG.cfg)
-	install(FILES
-		${ORBITER_BINARY_ROOT_DIR}/Orbiter.cfg 
-		${ORBITER_BINARY_ROOT_DIR}/Orbiter_NG.cfg 
-		DESTINATION ${ORBITER_INSTALL_ROOT_DIR}
-	)
 endif()
 
 

diff --git a/Doc/CMakeLists.txt b/Doc/CMakeLists.txt
@@ -10,7 +10,7 @@ add_custom_command(
 add_custom_target(OrbiterDoc
 	DEPENDS ${out}
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	OrbiterDoc
 )
 set_target_properties(OrbiterDoc
@@ -33,7 +33,7 @@ add_custom_command(
 add_custom_target(OrbiterConfigDoc
 	DEPENDS ${out}
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	OrbiterConfigDoc
 )
 set_target_properties(OrbiterConfigDoc
@@ -56,7 +56,7 @@ add_custom_command(
 add_custom_target(PlanetTexturesDoc
 	DEPENDS ${out}
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	PlanetTexturesDoc
 )
 set_target_properties(PlanetTexturesDoc

diff --git a/Doc/Technotes/composite/CMakeLists.txt b/Doc/Technotes/composite/CMakeLists.txt
@@ -22,7 +22,7 @@ add_custom_command(
 add_custom_target(CompositeTechnote
 	DEPENDS ${out_path}
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	CompositeTechnote
 )
 set_target_properties(CompositeTechnote

diff --git a/Doc/Technotes/distmass/CMakeLists.txt b/Doc/Technotes/distmass/CMakeLists.txt
@@ -24,7 +24,7 @@ add_custom_command(
 add_custom_target(DistmassTechnote
 	DEPENDS ${out_path}
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	DistmassTechnote
 )
 set_target_properties(DistmassTechnote

diff --git a/Doc/Technotes/dynamics/CMakeLists.txt b/Doc/Technotes/dynamics/CMakeLists.txt
@@ -24,7 +24,7 @@ add_custom_command(
 add_custom_target(DynamicsTechnote
 	DEPENDS ${out_path}
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	DynamicsTechnote
 )
 set_target_properties(DynamicsTechnote

diff --git a/Doc/Technotes/earth_atm/CMakeLists.txt b/Doc/Technotes/earth_atm/CMakeLists.txt
@@ -24,7 +24,7 @@ add_custom_command(
 add_custom_target(EarthAtmTechnote
 	DEPENDS ${out_path}
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	EarthAtmTechnote
 )
 set_target_properties(EarthAtmTechnote

diff --git a/Doc/Technotes/gravity/CMakeLists.txt b/Doc/Technotes/gravity/CMakeLists.txt
@@ -22,7 +22,7 @@ add_custom_command(
 add_custom_target(GravityTechnote
 	DEPENDS ${out_path}
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	GravityTechnote
 )
 set_target_properties(GravityTechnote

diff --git a/Doc/Technotes/lighting/CMakeLists.txt b/Doc/Technotes/lighting/CMakeLists.txt
@@ -22,7 +22,7 @@ add_custom_command(
 add_custom_target(LightingTechnote
 	DEPENDS ${out_path}
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	LightingTechnote
 )
 set_target_properties(LightingTechnote

diff --git a/Doc/Technotes/precession/CMakeLists.txt b/Doc/Technotes/precession/CMakeLists.txt
@@ -22,7 +22,7 @@ add_custom_command(
 add_custom_target(PrecessionTechnote
 	DEPENDS ${out_path}
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	PrecessionTechnote
 )
 set_target_properties(PrecessionTechnote

diff --git a/Html/Main/CMakeLists.txt b/Html/Main/CMakeLists.txt
@@ -20,7 +20,7 @@ add_custom_command(OUTPUT ${ORBITER_BINARY_HTML_DIR}/${name}.chm
 add_custom_target(${name}_chm
 	DEPENDS ${ORBITER_BINARY_HTML_DIR}/${name}.chm
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	${name}_chm
 )
 

diff --git a/Html/Main/Credit/CMakeLists.txt b/Html/Main/Credit/CMakeLists.txt
@@ -19,7 +19,7 @@ add_custom_command(OUTPUT ${ORBITER_BINARY_HTML_DIR}/${name}.chm
 add_custom_target(${name}_chm
 	DEPENDS ${ORBITER_BINARY_HTML_DIR}/${name}.chm
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	${name}_chm
 )
 

diff --git a/Html/Main/OrbitPrimer/CMakeLists.txt b/Html/Main/OrbitPrimer/CMakeLists.txt
@@ -19,7 +19,7 @@ add_custom_command(OUTPUT ${ORBITER_BINARY_HTML_DIR}/${name}.chm
 add_custom_target(${name}_chm
 	DEPENDS ${ORBITER_BINARY_HTML_DIR}/${name}.chm
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	${name}_chm
 )
 

diff --git a/Html/Scenarios/CMakeLists.txt b/Html/Scenarios/CMakeLists.txt
@@ -6,7 +6,7 @@ add_custom_command(
 add_custom_target(CurrentState_htm
 	DEPENDS CurrentState.htm CurrentState_img.htm
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	CurrentState_htm
 )
 

diff --git a/Html/Scenarios/Default/Alps2016/CMakeLists.txt b/Html/Scenarios/Default/Alps2016/CMakeLists.txt
@@ -20,7 +20,7 @@ add_custom_command(OUTPUT ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 add_custom_target(${name}_chm
 	DEPENDS ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	${name}_chm
 )
 

diff --git a/Html/Scenarios/Default/Challenges/Challenge1/CMakeLists.txt b/Html/Scenarios/Default/Challenges/Challenge1/CMakeLists.txt
@@ -20,7 +20,7 @@ add_custom_command(OUTPUT ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 add_custom_target(${name}_chm
 	DEPENDS ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	${name}_chm
 )
 

diff --git a/Html/Scenarios/Default/Challenges/Challenge2/CMakeLists.txt b/Html/Scenarios/Default/Challenges/Challenge2/CMakeLists.txt
@@ -20,7 +20,7 @@ add_custom_command(OUTPUT ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 add_custom_target(${name}_chm
 	DEPENDS ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	${name}_chm
 )
 

diff --git a/Html/Scenarios/Default/Checklists/Checklist1/CMakeLists.txt b/Html/Scenarios/Default/Checklists/Checklist1/CMakeLists.txt
@@ -20,7 +20,7 @@ add_custom_command(OUTPUT ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 add_custom_target(${name}_chm
 	DEPENDS ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	${name}_chm
 )
 

diff --git a/Html/Scenarios/Default/Checklists/Checklist2/CMakeLists.txt b/Html/Scenarios/Default/Checklists/Checklist2/CMakeLists.txt
@@ -20,7 +20,7 @@ add_custom_command(OUTPUT ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 add_custom_target(${name}_chm
 	DEPENDS ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	${name}_chm
 )
 

diff --git a/Html/Scenarios/Default/Checklists/Checklist3/CMakeLists.txt b/Html/Scenarios/Default/Checklists/Checklist3/CMakeLists.txt
@@ -20,7 +20,7 @@ add_custom_command(OUTPUT ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 add_custom_target(${name}_chm
 	DEPENDS ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	${name}_chm
 )
 

diff --git a/Html/Scenarios/Default/Checklists/Quickstart/CMakeLists.txt b/Html/Scenarios/Default/Checklists/Quickstart/CMakeLists.txt
@@ -20,7 +20,7 @@ add_custom_command(OUTPUT ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 add_custom_target(${name}_chm
 	DEPENDS ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	${name}_chm
 )
 

diff --git a/Html/Scenarios/Default/Earthview2016/CMakeLists.txt b/Html/Scenarios/Default/Earthview2016/CMakeLists.txt
@@ -19,7 +19,7 @@ add_custom_command(OUTPUT ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 add_custom_target(${name}_chm
 	DEPENDS ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	${name}_chm
 )
 

diff --git a/Html/Scenarios/Default/KSCtour2016/CMakeLists.txt b/Html/Scenarios/Default/KSCtour2016/CMakeLists.txt
@@ -19,7 +19,7 @@ add_custom_command(OUTPUT ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 add_custom_target(${name}_chm
 	DEPENDS ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	${name}_chm
 )
 

diff --git a/Html/Scenarios/Default/ShuttleAscentAp/CMakeLists.txt b/Html/Scenarios/Default/ShuttleAscentAp/CMakeLists.txt
@@ -19,7 +19,7 @@ add_custom_command(OUTPUT ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 add_custom_target(${name}_chm
 	DEPENDS ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	${name}_chm
 )
 

diff --git a/Html/Scenarios/Default/Welcome2016/CMakeLists.txt b/Html/Scenarios/Default/Welcome2016/CMakeLists.txt
@@ -20,7 +20,7 @@ add_custom_command(OUTPUT ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 add_custom_target(${name}_chm
 	DEPENDS ${ORBITER_BINARY_HTML_DIR}/${subdir}/${name}.chm
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	${name}_chm
 )
 

diff --git a/OVP/D3D7Client/CMakeLists.txt b/OVP/D3D7Client/CMakeLists.txt
@@ -49,7 +49,7 @@ target_include_directories(D3D7Client
 )
 
 add_dependencies(D3D7Client
-	Orbiter
+	${OrbiterTgt}
 	Orbitersdk
 	GDIClient
 )

diff --git a/OVP/GDIClient/CMakeLists.txt b/OVP/GDIClient/CMakeLists.txt
@@ -15,7 +15,7 @@ target_include_directories(GDIClient
 )
 
 add_dependencies(GDIClient
-	Orbiter
+	${OrbiterTgt}
 	Orbitersdk
 )
 

diff --git a/Orbitersdk/doc/CMakeLists.txt b/Orbitersdk/doc/CMakeLists.txt
@@ -10,7 +10,7 @@ add_custom_command(
 add_custom_target(APIGuideDoc
 	DEPENDS ${out}
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	APIGuideDoc
 )
 install(FILES ${out}
@@ -29,7 +29,7 @@ add_custom_command(
 add_custom_target(3DModelDoc
 	DEPENDS ${out}
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	3DModelDoc
 )
 install(FILES ${out}

diff --git a/Orbitersdk/doxygen/CMakeLists.txt b/Orbitersdk/doxygen/CMakeLists.txt
@@ -29,7 +29,7 @@ endif()
 add_custom_target(APIReference
 	DEPENDS ${api_ref_out}
 )
-add_dependencies(Orbiter
+add_dependencies(${OrbiterTgt}
 	APIReference
 )
 

diff --git a/Src/CMakeLists.txt b/Src/CMakeLists.txt
@@ -2,10 +2,13 @@
 # Licensed under the MIT License
 
 add_subdirectory(Orbiter)
-add_subdirectory(Orbiter_ng)
 add_subdirectory(Orbitersdk)
 add_subdirectory(DlgCtrl)
 add_subdirectory(Celbody)
 add_subdirectory(Vessel)
 add_subdirectory(Module)
 add_subdirectory(Plugin)
+
+if(BUILD_ORBITER_SERVER)
+	add_subdirectory(Orbiter_ng)
+endif()
diff --git a/Src/Celbody/Galsat/CMakeLists.txt b/Src/Celbody/Galsat/CMakeLists.txt
@@ -14,7 +14,7 @@ set_target_properties(Galsat
 )
 
 add_dependencies(Galsat
-	Orbiter
+	${OrbiterTgt}
 	Orbitersdk
 )
 

diff --git a/Src/Celbody/Galsat/Callisto/CMakeLists.txt b/Src/Celbody/Galsat/Callisto/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library(${CELBODY} SHARED
 
 add_dependencies(${CELBODY}
 	Galsat
-	Orbiter
+	${OrbiterTgt}
 	Orbitersdk
 )
 

diff --git a/Src/Celbody/Galsat/Europa/CMakeLists.txt b/Src/Celbody/Galsat/Europa/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library(${CELBODY} SHARED
 
 add_dependencies(${CELBODY}
 	Galsat
-	Orbiter
+	${OrbiterTgt}
 	Orbitersdk
 )