David Rose пре 19 година
родитељ
комит
b72ac70e1e

+ 1 - 4
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

+ 1 - 4
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

+ 1 - 1
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

+ 1 - 1
panda/src/windisplay/winDetectDx8.cxx

@@ -19,7 +19,7 @@
 
 #include "pandabase.h"
 
-#if HAVE_DX8
+#ifdef HAVE_DX8
 
 #include <d3d8.h>
 

+ 1 - 1
panda/src/windisplay/winDetectDx9.cxx

@@ -19,7 +19,7 @@
 
 #include "pandabase.h"
 
-#if HAVE_DX9
+#ifdef HAVE_DX9
 
 #include <d3d9.h>
 

+ 2 - 2
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);