From 96a4b267f09e240cc9c920ab14fd63d2ec6a1950 Mon Sep 17 00:00:00 2001
From: aignacio_sf <>
Date: Mon, 22 Jan 2007 22:56:53 +0000
Subject: [PATCH] Add HAVE_DX checks.

---
 panda/src/windisplay/winDetectDx7.cxx    | 6 ++++++
 panda/src/windisplay/winDetectDx8.cxx    | 6 ++++++
 panda/src/windisplay/winDetectDx9.cxx    | 6 ++++++
 panda/src/windisplay/winGraphicsPipe.cxx | 4 ++++
 4 files changed, 22 insertions(+)

diff --git a/panda/src/windisplay/winDetectDx7.cxx b/panda/src/windisplay/winDetectDx7.cxx
index 607e13b8b2..098b339e48 100644
--- a/panda/src/windisplay/winDetectDx7.cxx
+++ b/panda/src/windisplay/winDetectDx7.cxx
@@ -17,6 +17,10 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "dtool_config.h"
+
+#if HAVE_DX
+
 #include <ddraw.h>
 
 #include "graphicsStateGuardian.h"
@@ -71,3 +75,5 @@ int dx7_display_information (DisplaySearchParameters &display_search_parameters,
 
   return state;
 }
+
+#endif
diff --git a/panda/src/windisplay/winDetectDx8.cxx b/panda/src/windisplay/winDetectDx8.cxx
index 41bee4b81a..7b77e62e1a 100644
--- a/panda/src/windisplay/winDetectDx8.cxx
+++ b/panda/src/windisplay/winDetectDx8.cxx
@@ -17,6 +17,10 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "dtool_config.h"
+
+#if HAVE_DX
+
 #include <d3d8.h>
 
 #include "graphicsStateGuardian.h"
@@ -45,3 +49,5 @@ static char *direct_3d_create_function_name = "Direct3DCreate8";
 int dx8_display_information (DisplaySearchParameters &display_search_parameters, DisplayInformation *display_information) {
   return get_display_information (display_search_parameters, display_information);
 }
+
+#endif
diff --git a/panda/src/windisplay/winDetectDx9.cxx b/panda/src/windisplay/winDetectDx9.cxx
index 314ee55df1..9d8b59a084 100644
--- a/panda/src/windisplay/winDetectDx9.cxx
+++ b/panda/src/windisplay/winDetectDx9.cxx
@@ -17,6 +17,10 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "dtool_config.h"
+
+#if HAVE_DX
+
 #include <d3d9.h>
 
 #include "graphicsStateGuardian.h"
@@ -46,3 +50,5 @@ static char *direct_3d_create_function_name = "Direct3DCreate9";
 int dx9_display_information (DisplaySearchParameters &display_search_parameters, DisplayInformation *display_information) {
   return get_display_information (display_search_parameters, display_information);
 }
+
+#endif
diff --git a/panda/src/windisplay/winGraphicsPipe.cxx b/panda/src/windisplay/winGraphicsPipe.cxx
index afe40ac844..a61dc39e7d 100644
--- a/panda/src/windisplay/winGraphicsPipe.cxx
+++ b/panda/src/windisplay/winGraphicsPipe.cxx
@@ -19,6 +19,7 @@
 #include "winGraphicsPipe.h"
 #include "config_windisplay.h"
 #include "displaySearchParameters.h"
+#include "dtool_config.h"
 
 TypeHandle WinGraphicsPipe::_type_handle;
 
@@ -41,6 +42,7 @@ WinGraphicsPipe() {
       (PFN_TRACKMOUSEEVENT)GetProcAddress(_hUser32, "TrackMouseEvent");
   }
 
+#if HAVE_DX
   int dx7_display_information (DisplaySearchParameters &display_search_parameters, DisplayInformation *display_information);
   int dx8_display_information (DisplaySearchParameters &display_search_parameters, DisplayInformation *display_information);
   int dx9_display_information (DisplaySearchParameters &display_search_parameters, DisplayInformation *display_information);
@@ -62,6 +64,8 @@ WinGraphicsPipe() {
 
     }
   }
+#endif
+
 }
 
 ////////////////////////////////////////////////////////////////////