From ecfd924f0de9dd43ba57408398cd03b58754c944 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Sun, 18 Feb 2018 23:34:02 -0700 Subject: [PATCH] CMake: Remove references to unsupported versions of DirectX. --- dtool/Config.cmake | 4 ---- dtool/LocalSetup.cmake | 18 ------------------ dtool/dtool_config.h.in | 9 --------- panda/src/framework/CMakeLists.txt | 5 ----- 4 files changed, 36 deletions(-) diff --git a/dtool/Config.cmake b/dtool/Config.cmake index 445cca4f09..7ba8afc0d9 100644 --- a/dtool/Config.cmake +++ b/dtool/Config.cmake @@ -483,12 +483,8 @@ package_option(CG package_option(CGGL "Enable support for Nvidia Cg's OpenGL API." LICENSE "Nvidia") -package_option(CGDX8 "Enable support for Nvidia Cg's DX8 API." - LICENSE "Nvidia") package_option(CGDX9 "Enable support for Nvidia Cg's DX9 API." LICENSE "Nvidia") -package_option(CGDX10 "Enable support for Nvidia Cg's DX10 API." - LICENSE "Nvidia") # Is VRPN installed, and where? diff --git a/dtool/LocalSetup.cmake b/dtool/LocalSetup.cmake index e875342c5d..1d6d442e43 100644 --- a/dtool/LocalSetup.cmake +++ b/dtool/LocalSetup.cmake @@ -201,24 +201,12 @@ else() message("- Did not find Cg OpenGL API") endif() -if(HAVE_CGDX8) - message("+ Cg DX8 API") -else() - message("- Did not find Cg DX8 API") -endif() - if(HAVE_CGDX9) message("+ Cg DX9 API") else() message("- Did not find Cg DX9 API") endif() -if(HAVE_CGDX10) - message("+ Cg DX10 API") -else() - message("- Did not find Cg DX10 API") -endif() - if(HAVE_VRPN) message("+ VRPN") else() @@ -303,12 +291,6 @@ else() message("- Did not find OpenGL ES 2") endif() -if(HAVE_DX8) - message("+ DirectX8") -else() - message("- Did not find DirectX8") -endif() - if(HAVE_DX9) message("+ DirectX9") else() diff --git a/dtool/dtool_config.h.in b/dtool/dtool_config.h.in index 4cfc7d70c7..63b2e23dcf 100644 --- a/dtool/dtool_config.h.in +++ b/dtool/dtool_config.h.in @@ -98,15 +98,9 @@ /* Define if we have CGGL installed. */ #cmakedefine HAVE_CGGL -/* Define if we have CGDX8 installed. */ -#cmakedefine HAVE_CGDX8 - /* Define if we have CGDX9 installed. */ #cmakedefine HAVE_CGDX9 -/* Define if we have CGDX10 installed. */ -#cmakedefine HAVE_CGDX10 - /* Define for dxerr.h instead of dxerr9.h. */ #cmakedefine USE_GENERIC_DXERR_LIBRARY @@ -158,9 +152,6 @@ /* Define if we have Windows-GL installed and want to build for Wgl. */ #cmakedefine HAVE_WGL -/* Define if we have DirectX installed and want to build for DX. */ -#cmakedefine HAVE_DX8 - /* Define if we have DirectX installed and want to build for DX. */ #cmakedefine HAVE_DX9 diff --git a/panda/src/framework/CMakeLists.txt b/panda/src/framework/CMakeLists.txt index ff441c724a..a2444365a1 100644 --- a/panda/src/framework/CMakeLists.txt +++ b/panda/src/framework/CMakeLists.txt @@ -20,11 +20,6 @@ if(NOT BUILD_SHARED_LIBS) ${P3FRAMEWORK_LINK_TARGETS} pandagl ) - elseif(HAVE_DX10) - set(P3FRAMEWORK_LINK_TARGETS - ${P3FRAMEWORK_LINK_TARGETS} - pandadx10 - ) elseif(HAVE_DX9) set(P3FRAMEWORK_LINK_TARGETS ${P3FRAMEWORK_LINK_TARGETS}