Removed DX7 client (orbitersim#485)

CMakeLists.txt

@@ -90,10 +90,6 @@ set(GDICLIENT_LIB $<TARGET_LINKER_FILE:GDIClient>)
 
 set(EXTERN_DIR "${CMAKE_SOURCE_DIR}/Extern")
 
-set(DX7SDK_PATH "${EXTERN_DIR}/mssdk_dx7")
-set(DX7SDK_INCLUDE_DIR "${DX7SDK_PATH}/include")
-set(DX7SDK_LIB_DIR "${DX7SDK_PATH}/lib")
-
 set(HTMLHELP_DIR "${EXTERN_DIR}/Htmlhelp")
 set(HTMLHELP_INCLUDE_DIR ${HTMLHELP_DIR}/include)
 set(HTMLHELP_LIB_DIR ${HTMLHELP_DIR}/lib-${ARCH})
@@ -155,47 +151,8 @@ 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)")
-
-if(BUILD64) # only allow graphics server version on x64 builds
-
-	set(ORBITER_GRAPHICS ${OrbiterExe_ng})
-
-else()
-
-	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}
-	)
-
-endif()
-
-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()
+set(OrbiterTgt Orbiter)
+set(ORBITER_LIB $<TARGET_LINKER_FILE:Orbiter>)
 
 # =====================================================================================
 # Configure Orbiter.cfg for externally installed planet textures
@@ -217,33 +174,14 @@ 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(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)
+	install(FILES ${ORBITER_BINARY_ROOT_DIR}/Orbiter.cfg DESTINATION ${ORBITER_INSTALL_ROOT_DIR})
 endif()
 
 
 # =====================================================================================
 # Find required and optional build tools
 
-#option(ORBITER_BUILD_WITH_DX7
-#	"Compile Orbiter with built-in DX7 graphics. If off, the server version for external graphics clients will be built."
-#	ON
-#)
-
 option(
 	ORBITER_BUILD_D3D9CLIENT
 	"Build the D3D9 graphics client"

OVP/CMakeLists.txt

@@ -3,10 +3,6 @@
 
 add_subdirectory(GDIClient)
 
-if(NOT BUILD64)
-	add_subdirectory(D3D7Client)
-endif()
-
 if(ORBITER_BUILD_D3D9CLIENT)
 	add_subdirectory(D3D9Client)
 endif()