From b72ac70e1e03a99e34e0deabd7289abec06e4045 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 8 Feb 2007 18:28:33 +0000
Subject: [PATCH] fix build errors

---
 panda/src/dxgsg8/Sources.pp              | 5 +----
 panda/src/dxgsg9/Sources.pp              | 5 +----
 panda/src/windisplay/Sources.pp          | 2 +-
 panda/src/windisplay/winDetectDx8.cxx    | 2 +-
 panda/src/windisplay/winDetectDx9.cxx    | 2 +-
 panda/src/windisplay/winGraphicsPipe.cxx | 4 ++--
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/panda/src/dxgsg8/Sources.pp b/panda/src/dxgsg8/Sources.pp
index 0ae612ec6a..3dfd4ff1f7 100644
--- a/panda/src/dxgsg8/Sources.pp
+++ b/panda/src/dxgsg8/Sources.pp
@@ -3,11 +3,8 @@
 #define OTHER_LIBS \
    interrogatedb:c dconfig:c dtoolconfig:m \
    dtoolutil:c dtoolbase:c dtool:m
-
-#define WIN_SYS_LIBS \
-   d3d8.lib d3dx8.lib dxerr8.lib
    
-#define USE_PACKAGES dx
+#define USE_PACKAGES dx8
 
 #begin lib_target
   #define TARGET dxgsg8
diff --git a/panda/src/dxgsg9/Sources.pp b/panda/src/dxgsg9/Sources.pp
index b1fe8138bb..58d39ad658 100755
--- a/panda/src/dxgsg9/Sources.pp
+++ b/panda/src/dxgsg9/Sources.pp
@@ -3,11 +3,8 @@
 #define OTHER_LIBS \
    interrogatedb:c dconfig:c dtoolconfig:m \
    dtoolutil:c dtoolbase:c dtool:m
-
-#define WIN_SYS_LIBS \
-   d3d9.lib d3dx9.lib dxerr9.lib
    
-#define USE_PACKAGES dx cg cgdx9
+#define USE_PACKAGES dx9 cg cgdx9
 
 #begin lib_target
   #define TARGET dxgsg9
diff --git a/panda/src/windisplay/Sources.pp b/panda/src/windisplay/Sources.pp
index a7a1d2f849..a780f6811b 100644
--- a/panda/src/windisplay/Sources.pp
+++ b/panda/src/windisplay/Sources.pp
@@ -6,7 +6,7 @@
 
 #define BUILDING_DLL BUILDING_PANDAWIN
 
-#define USE_PACKAGES dx
+#define USE_PACKAGES dx8 dx9
 
 #begin lib_target
   #define TARGET windisplay
diff --git a/panda/src/windisplay/winDetectDx8.cxx b/panda/src/windisplay/winDetectDx8.cxx
index e1f84aa7e7..f8a0f6f8c0 100644
--- a/panda/src/windisplay/winDetectDx8.cxx
+++ b/panda/src/windisplay/winDetectDx8.cxx
@@ -19,7 +19,7 @@
 
 #include "pandabase.h"
 
-#if HAVE_DX8
+#ifdef HAVE_DX8
 
 #include <d3d8.h>
 
diff --git a/panda/src/windisplay/winDetectDx9.cxx b/panda/src/windisplay/winDetectDx9.cxx
index ad231030a2..abc8c5f3bd 100644
--- a/panda/src/windisplay/winDetectDx9.cxx
+++ b/panda/src/windisplay/winDetectDx9.cxx
@@ -19,7 +19,7 @@
 
 #include "pandabase.h"
 
-#if HAVE_DX9
+#ifdef HAVE_DX9
 
 #include <d3d9.h>
 
diff --git a/panda/src/windisplay/winGraphicsPipe.cxx b/panda/src/windisplay/winGraphicsPipe.cxx
index b145a1c897..ad03bfed96 100644
--- a/panda/src/windisplay/winGraphicsPipe.cxx
+++ b/panda/src/windisplay/winGraphicsPipe.cxx
@@ -42,7 +42,7 @@ WinGraphicsPipe() {
       (PFN_TRACKMOUSEEVENT)GetProcAddress(_hUser32, "TrackMouseEvent");
   }
 
-#if HAVE_DX9
+#ifdef HAVE_DX9
   DisplaySearchParameters display_search_parameters_dx9;
   int dx9_display_information (DisplaySearchParameters &display_search_parameters_dx9, DisplayInformation *display_information);
 
@@ -51,7 +51,7 @@ WinGraphicsPipe() {
   }
 #endif
 
-#if HAVE_DX8
+#ifdef HAVE_DX8
   DisplaySearchParameters display_search_parameters_dx8;
   int dx8_display_information (DisplaySearchParameters &display_search_parameters_dx8, DisplayInformation *display_information);